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

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

@@ -65,8 +65,8 @@ public class EsiKpiReportEJB extends ValidatorEJB implements EsiKpiReportEJBLoca
 					"(SELECT DESCR  FROM STATION WHERE STAN_CODE = EMP.STAN_CODE__HQ) AS ESI_HQ,MR.EMP_CODE AS EMPLOYEE_CODE,MR.DESIGNATION AS ESI_DSG,MR.EMP_FNAME||' '||MR.EMP_LNAME AS MR_NAME, " +
 					"(SELECT COUNT(*) FROM SFA_TIME WHERE DT>=(SELECT FR_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE) AND DT<=(SELECT TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE) ) AS DAYS_IN_MONTH, " +
 					"(SELECT COUNT(*) FROM SFA_TIME WHERE DT>=? AND DT<=? ) AS No_SHOW,(SELECT COUNT(*) FROM SPRS_ACT_TRAN SP,FIELDACTIVITY FP WHERE SP.EVENT_DATE>=? AND SP.EVENT_DATE<=? AND SP.SALES_PERS=EMP.EMP_CODE AND SP.ACTIVITY_CODE= FP.ACTIVITY_CODE AND FP.ACTIVITY_TYPE = 'FW') AS TOTAL_FW_DAYS, " +
-					"(SELECT COUNT(*) FROM SPRS_ACT_TRAN SP,FIELDACTIVITY FP where SP.EVENT_DATE>=? AND SP.EVENT_DATE<=? AND SP.SALES_PERS=EMP.EMP_CODE AND SP.ACTIVITY_CODE= FP.ACTIVITY_CODE AND FP.ACTIVITY_TYPE = 'NFW') AS TOTAL_NFW_DAYS,(SELECT COUNT(*) FROM HOLIDAY WHERE HOL_DATE>=(SELECT FR_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE) AND HOL_DATE<=(SELECT TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE) AND HOL_TYPE!='W' AND HOL_TBLNO=MR.HOL_TBLNO) AS HOLIDAY, " +
-					"(SELECT COUNT(*) FROM HOLIDAY WHERE HOL_DATE>=(SELECT FR_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE) AND HOL_DATE<=(SELECT TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE) AND HOL_TYPE ='W' AND HOL_TBLNO=MR.HOL_TBLNO AND DESCR='SUNDAY') AS SUNDAY,(SELECT COUNT(*) FROM SPRS_ACT_TRAN SP,FIELDACTIVITY FP where SP.EVENT_DATE>=? AND SP.EVENT_DATE<=? AND SP.SALES_PERS=EMP.EMP_CODE AND SP.ACTIVITY_CODE= FP.ACTIVITY_CODE AND FP.ACTIVITY_TYPE = 'LEAVE') AS LEAVE, " +
+					"(SELECT COUNT(*) FROM SPRS_ACT_TRAN SP,FIELDACTIVITY FP where SP.EVENT_DATE>=? AND SP.EVENT_DATE<=? AND SP.SALES_PERS=EMP.EMP_CODE AND SP.ACTIVITY_CODE= FP.ACTIVITY_CODE AND FP.ACTIVITY_TYPE = 'NFW') AS TOTAL_NFW_DAYS,(SELECT COUNT(*) FROM HOLIDAY WHERE HOL_DATE>=? AND HOL_DATE<=? AND HOL_TYPE!='W' AND HOL_TBLNO=MR.HOL_TBLNO) AS HOLIDAY, " +
+					"(SELECT COUNT(*) FROM HOLIDAY WHERE HOL_DATE>=? AND HOL_DATE<=? AND HOL_TYPE ='W' AND HOL_TBLNO=MR.HOL_TBLNO AND DESCR='SUNDAY') AS SUNDAY,(SELECT COUNT(*) FROM SPRS_ACT_TRAN SP,FIELDACTIVITY FP where SP.EVENT_DATE>=? AND SP.EVENT_DATE<=? AND SP.SALES_PERS=EMP.EMP_CODE AND SP.ACTIVITY_CODE= FP.ACTIVITY_CODE AND FP.ACTIVITY_TYPE = 'LEAVE') AS LEAVE, " +
 					"(SELECT COUNT(*) FROM STRG_SERIES SS WHERE SS.SALES_PERS=MR.EMP_CODE AND SS.STATUS='Y' AND SS.CUST_TYPE='D') AS TOTAL_LISTED_DRS_COUNT,(SELECT DISTINCT(COUNT(STRG_CODE)) FROM STRG_MEET SM WHERE SM.SALES_PERS=EMP.EMP_CODE AND SM.STRG_TYPE='D' AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND STRG_CODE!='-NA-') AS TOTAL_LISTED_DRs_COVERED, " +
 					"(SELECT DISTINCT(COUNT(SC_CODE)) FROM STRG_SERIES WHERE CLASS_CODE='G' AND STATUS='Y' AND SALES_PERS=EMP.EMP_CODE AND CUST_TYPE='D') AS LISTED_SUPPORTER_DOCTORS_COUNT,(SELECT COUNT(*) FROM STRG_MEET WHERE STRG_CLASS_CODE='G' AND SALES_PERS=MR.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-') AS TOTAL_CALL_SUPPORTER, " +
 					"(SELECT DISTINCT(COUNT(STRG_CODE)) FROM STRG_MEET WHERE STRG_CLASS_CODE='G' AND SALES_PERS=MR.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-') AS NOT_SHOW_SUPPORTER,(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='G' AND SALES_PERS=EMP.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-' GROUP BY STRG_CODE HAVING COUNT(*) = 1) AS VISTED_ONCE_SUPPORTER, " +