Add new columns in json for calculate eco and tlsd field in offline.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101802 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/sfa/ejb/CurrentDayWrkSummary.java

@@ -220,7 +220,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 			
 			sql =   "  Select " +
 					//"To_CHAR(TRUNC(?),'DD-MM-YYYY') as show_Date , " +
-					"SalesPerson_Code , " +
+					"SalesPerson_Code , To_Calls," +
 			" SalesPerson_Name , nvl(SUM(Tot_Calls),0) as Tot_Calls , nvl(SUM(Tot_PC),0) as Tot_PC , " +
 			" nvl(SUM((To_Calls - Tot_Dist_Calls)),0) as Call_Bal , nvl(SUM(TLSD),0) as TLSD , " +
 			" nvl(SUM(Ord_Val),0) as Ord_Val , nvl(SUM(Display),0) as Display " +
@@ -245,7 +245,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 			" " + appendSqlStr + " " +
 			" Group By SM.Sales_Pers ," +
 			" SP.SP_Name ,SM.dcr_id ) " +
-			" Group By SalesPerson_Name, SalesPerson_Code Order By SalesPerson_Name";
+			" Group By SalesPerson_Name, To_Calls, SalesPerson_Code Order By SalesPerson_Name";
 			
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setTimestamp(1, java.sql.Timestamp.valueOf(date));
@@ -290,7 +290,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rowData.put("ordval",checkNull( rs.getString("ORD_VAL")));
 				rowData.put("display",checkNull( rs.getString("DISPLAY")));
 				
-					
+				rowData.put("To_Calls",checkNull( rs.getString("To_Calls")));
 				rawDataCurrentDayWrkSumDtlJson.put(count, rowData);
 				count++;
 				
@@ -1102,16 +1102,20 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 					""+year+" AS Year, " +
 					"strg_meet.sales_pers AS sales_pers_code, " +
 					"sales_pers.sp_name AS SalesPerson, " +
-					"to_char(To_Date(strg_meet.Event_Date),'DD-MM-YYYY') as EVENT_DATE, " +
+					"to_char(To_Date(strg_meet.Event_Date),'DD-MON-YYYY') as EVENT_DATE, " +
 					"Loc.Descr as Locality,  " +
 					"Coalesce((select employee.name_prefix || ' ' || employee.emp_fname || ' ' || employee.emp_lname " +
 					"from employee " +
 					"where  employee.emp_code = SALES_PERS1.sales_pers ),'Self') AS Visited_With, " +
+					"   listagg(strg_meet.strg_code, ',') within group (order by strg_meet.strg_code) as Strg_Code, " +
 					"nvl(count(strg_meet.strg_code),0) as Tot_Calls  ," +
+					"nvl((select count(distinct strg_code) from STRG_ITEM_DISPLAY SID where SID.dcr_id=strg_meet.dcr_id),0) as display ,"+
 					"FN_R_TOT_PC(strg_meet.dcr_id,strg_meet.EVENT_DATE," +
 					"strg_meet.sales_pers,strg_meet.Locality_Code) as Tot_PC  ," +
 					"round((CASE When FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) = 0 then 0 " +
 					"else FN_R_CUMM_SMO(strg_meet.EVENT_DATE,strg_meet.sales_pers)/FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) end),2) as TLSD  ," +
+					" FN_R_CUMM_SMO(strg_meet.EVENT_DATE,strg_meet.sales_pers) as day_tlsd," +
+					" FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) as day_count," +
 					"FN_R_ORD_VAL(strg_meet.dcr_id,strg_meet.EVENT_DATE,strg_meet.sales_pers,strg_meet.Locality_Code) as Ord_Val  " +
 					"FROM sales_pers " +
 					"INNER JOIN " +
@@ -1180,8 +1184,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 					rowData.put("salesperson_name", "");
 					rowData.put("salesperson_code", "");
 				}
-				
-				
 				rowData.put("month",checkNull (rs.getString("MONTH")));						
 				rowData.put("year", checkNull(rs.getString("YEAR")));
 				rowData.put("sales_pers_code_hidden",checkNull( rs.getString("SALES_PERS_CODE")));
@@ -1194,6 +1196,11 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rowData.put("tlsd",checkNull( rs.getString("TLSD")));
 				rowData.put("ordval",checkNull( rs.getString("ORD_VAL")));
 				
+				rowData.put("day_tlsd",checkNull( rs.getString("day_tlsd")));	//Added by chetan for calculate tlsd
+				rowData.put("day_count",checkNull( rs.getString("day_count")));	//Added by chetan for calculate tlsd
+				rowData.put("display",checkNull( rs.getString("display"))); //Added by chetan for calculate display
+				rowData.put("Strg_Code",checkNull( rs.getString("Strg_Code"))); //Added by chetan for calculate eco
+				
 				rawDataMTDWorkDtlJson.put(count, rowData);
 				count++;
 			}