Added SQL changes, column name changes.

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

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

@@ -65,7 +65,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 	*/
 	
 	
-	sql =   " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, " +
+	/*sql_160316 =   " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, " +
 			" ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED, I.DESCR ITEM_SERIES," +
 			" E.HOBBY1 REGION, E.CUR_STATE STATE, (NVL(TRIM(E1.EMP_FNAME),'')||NVL(TRIM(E1.EMP_MNAME),' ')||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, E.MOBILE_NO " +
 			" FROM (SELECT t.SALES_PERS,Max(T.EVENT_DATE) LAST_REPORT FROM SPRS_ACT_TRAN T " +
@@ -74,6 +74,34 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 			" start with e.emp_code = '" + empCode + "' " +
 			" connect by prior E.EMP_CODE = E.REPORT_TO) " +
 			" GRoup by t.SALES_PERS)A INNER JOIN SALES_PERS SP ON A.SALES_PERS = SP.SALES_PERS INNER  JOIN EMPLOYEE E ON SP.SALES_PERS = E.EMP_CODE INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO ";
+	*/
+			
+	/*Sql Changes on 150316*/
+	/*sql =   " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) " +
+			" NOT_REPORTED_DAYS," +
+			" I.DESCR DIVISION , E.HOBBY1 REGION, S.DESCR STATE, (NVL(TRIM(E1.EMP_FNAME),'')||NVL(TRIM(E1.EMP_MNAME),' ')||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME," +
+			" E.MOBILE_NO FROM (SELECT t.SALES_PERS,Max(T.EVENT_DATE) LAST_REPORT " +
+			" FROM SPRS_ACT_TRAN T WhERE T.SALEs_PERS IN (SELECT S.SALES_pERS " +
+			" FROM SALES_PErS S  INNER JOIN  EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE " +
+			" WHERE S.ACTIVE_YN='Y' " +
+			" start with e.emp_code = '" + empCode + "' " +
+			" connect by prior E.EMP_CODE = E.REPORT_TO) " +
+			" GRoup by t.SALES_PERS)A INNER JOIN SALES_PERS SP ON A.SALES_PERS = SP.SALES_PERS INNER  JOIN EMPLOYEE E ON SP.SALES_PERS = E.EMP_CODE INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE  ";
+	*/
+	
+	/*Final SQL On dated 160316*/		
+	
+	sql =   " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED_DAYS, " +
+			" I.DESCR DIVISION , E.HOBBY1 REGION, S.DESCR STATE, (NVL(TRIM(E1.EMP_FNAME),'')||NVL(TRIM(E1.EMP_MNAME),' ')||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, E.MOBILE_NO " +
+			" FROM ( SELECT t.SALES_PERS,Max(T.EVENT_DATE) LAST_REPORT " +
+			" FROM SPRS_ACT_TRAN T WhERE T.SALEs_PERS IN ( SELECT S.SALES_pERS FROM SALES_PErS S  " +
+			" INNER JOIN  EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE " +
+			" WHERE S.ACTIVE_YN='Y' " +
+			" start with e.emp_code = '" + empCode + "' " +
+			" connect by prior E.EMP_CODE = E.REPORT_TO ) " +
+			" AND T.CONFIRMED='Y' " +
+			" GRoup by t.SALES_PERS )A INNER JOIN SALES_PERS SP ON A.SALES_PERS = SP.SALES_PERS INNER  JOIN EMPLOYEE E ON SP.SALES_PERS = E.EMP_CODE " +
+			" INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE ";
 	
 	
 	System.out.println("sql is =" + sql);
@@ -96,11 +124,10 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
             rowData.put("lastreport",checkNull (rs.getString("LAST_REPORT")));
         }
 		
-		//rowData.put("lastreport", 	checkNull(rs.getString("LAST_REPORT")));
-		rowData.put("notreported",  checkNull(rs.getString("NOT_REPORTED")));
-		rowData.put("itemseries",  checkNull(rs.getString("ITEM_SERIES")));
-		rowData.put("region",  checkNull(rs.getString("REGION")));
-		rowData.put("state",  checkNull(rs.getString("STATE")));
+		rowData.put("notreporteddays",  checkNull(rs.getString("NOT_REPORTED_DAYS")));
+		rowData.put("division",   checkNull(rs.getString("DIVISION")));
+		rowData.put("region",       checkNull(rs.getString("REGION")));
+		rowData.put("state",        checkNull(rs.getString("STATE")));
 		rowData.put("empname",      checkNull(rs.getString("EMP_NAME")));
 		rowData.put("mobileno",     checkNull(rs.getString("MOBILE_NO")));
 		rowDataPendingTaskJson.put(Integer.valueOf(count), rowData);