Adding ESI-KPI report changes

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

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

@@ -25,7 +25,7 @@ public class EsiKpiReportEJB extends ValidatorEJB implements EsiKpiReportEJBLoca
 	public EsiKpiReportEJB()
 	{
 	}
-
+//added by mrunalini sinkar for Esi KPI Report(start)
 	@Override
 	public String getEsiKpiData(String loginCode, String dataSourceName, String fromDate, String toDate, String teamArgs ,String profileId) throws RemoteException,ITMException
 	{
@@ -61,23 +61,42 @@ public class EsiKpiReportEJB extends ValidatorEJB implements EsiKpiReportEJBLoca
 		    System.out.println("fromDateStr["+fromDate+"] toDateStr["+toDate+"]");
 			String query = ""; //$NON-NLS-1$
 			query=	
-					"SELECT MR.HOBBY1 AS REGION, (SELECT EMP_FNAME ||' ' || EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = HO.EMP_CODE ) AS SUPERVISOR_NAME,(SELECT DESCR  FROM STATION WHERE STAN_CODE = MGR.STAN_CODE__HQ) AS ABM_HQ, " +
-					"(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 MR.HOBBY1 AS REGION, "
+					+ "(SELECT EMP_FNAME ||' ' || EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = HO.EMP_CODE ) AS SUPERVISOR_NAME,"
+					+ "(SELECT DESCR  FROM STATION WHERE STAN_CODE = MGR.STAN_CODE__HQ) AS ABM_HQ, " +
+					"(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>=? 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 COUNT(DISTINCT(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 COUNT(DISTINCT(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 COUNT(DISTINCT(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, " +
-					"(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(*) = 2) AS VISITED_TWICE_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(*) >= 3) AS VISITED_THREE_SUPPORTER, " +
-					"(SELECT 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-' and EVENT_TYPE='PR') AS PR_SUPPORTER_DOCTOR,(SELECT COUNT(DISTINCT(SC_CODE)) FROM STRG_SERIES WHERE CLASS_CODE='H' AND STATUS='Y' AND SALES_PERS=EMP.EMP_CODE AND CUST_TYPE='D') AS LISTED_BELIEVERS_COUNT, " +
-					"(SELECT COUNT(*) FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=MR.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-') AS TOTAL_CALL_BELIVER,(SELECT COUNT(DISTINCT(STRG_CODE)) FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=MR.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-') AS NOT_SHOW_BELIVER, " +
-					"(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='H' 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_BELIVER,(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='H' 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(*) = 2) AS VISITED_TWICE_BELIVER, " +
-					"(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='H' 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(*) >= 3) AS VISITED_THREE_BELIVER,(SELECT COUNT(*) FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=EMP.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=?  AND STRG_CODE!='-NA-' and EVENT_TYPE='PR') AS PR_BELIVER_DOCTOR, " +
-					"(SELECT COUNT(*) FROM STRG_SERIES SS WHERE SS.SALES_PERS=MR.EMP_CODE AND SS.STATUS='Y' AND SS.CUST_TYPE='C') AS TOTALRETAILER_COUNT,(SELECT COUNT(DISTINCT(STRG_CODE)) FROM STRG_MEET SM WHERE SM.SALES_PERS=MR.EMP_CODE AND SM.STRG_TYPE='C' AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND strg_code!='-NA-') AS MET_COUNT, " +
-					"(SELECT COUNT(*) FROM STRG_MEET SM WHERE SM.SALES_PERS=MR.EMP_CODE AND SM.STRG_TYPE='C' AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND strg_code!='-NA-') AS TOTAL_CALLS_RETAILER,(SELECT SUM(VALUE) FROM STRG_MEET_ORDER SO,STRG_MEET SM  WHERE SO.TRAN_ID=SM.TRAN_ID AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND SM.SALES_PERS=EMP.EMP_CODE AND SM.STRG_TYPE='C') AS TOTAL_POB_DAY, " +
-					"(SELECT COUNT(*) AS COUNT FROM STRG_ITEM_DISPLAY SDI,STRG_MEET SM WHERE SDI.TRAN_ID=SM.TRAN_ID AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=?  AND SM.SALES_PERS=MR.EMP_CODE AND STRG_TYPE='C') AS DISPLAY_COUNT FROM ORG_STRUCTURE EMP ,ORG_STRUCTURE MGR, ORG_STRUCTURE HO , EMPLOYEE MR WHERE  EMP.EMP_CODE = MR.EMP_CODE AND EMP.POS_CODE__REPTO = MGR.POS_CODE AND MGR.POS_CODE__REPTO = HO.POS_CODE AND EMP.EMP_CODE IN "+getFormattedUserId(teamArgs)+"";
+					"(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>=? 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 INNER JOIN STRG_STATUS_HIST SSH ON SS.SALES_PERS=SSH.SALES_PERS AND SS.SC_CODE=SSH.SC_CODE WHERE SS.SALES_PERS=MR.EMP_CODE AND SSH.STATUS='Y' AND SS.CUST_TYPE='D' AND SSH.EFF_FROM<=? AND SSH.VALID_UPTO>=?) AS TOTAL_LISTED_DRS_COUNT,"
+					+ "(SELECT COUNT(DISTINCT(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 COUNT(DISTINCT(SSH.SC_CODE)) FROM STRG_SERIES SS INNER JOIN STRG_STATUS_HIST SSH ON SS.SALES_PERS=SSH.SALES_PERS AND SS.SC_CODE=SSH.SC_CODE  WHERE SS.CLASS_CODE='G' AND SSH.STATUS='Y' AND SS.SALES_PERS=EMP.EMP_CODE AND SS.CUST_TYPE='D' AND SSH.EFF_FROM<=? AND SSH.VALID_UPTO>=?) 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 COUNT(DISTINCT(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, " +
+					"(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(*) = 2) AS VISITED_TWICE_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(*) >= 3) AS VISITED_THREE_SUPPORTER, " +
+					"(SELECT 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-' and EVENT_TYPE='PR') AS PR_SUPPORTER_DOCTOR,"
+					+ "(SELECT COUNT(DISTINCT(SSH.SC_CODE)) FROM STRG_SERIES SS INNER JOIN STRG_STATUS_HIST SSH ON SS.SALES_PERS=SSH.SALES_PERS AND SS.SC_CODE=SSH.SC_CODE WHERE SS.CLASS_CODE='H' AND SSH.STATUS='Y' AND SS.SALES_PERS=EMP.EMP_CODE AND SS.CUST_TYPE='D' AND SSH.EFF_FROM<=? AND SSH.VALID_UPTO>=?) AS LISTED_BELIEVERS_COUNT, " +
+					"(SELECT COUNT(*) FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=MR.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-') AS TOTAL_CALL_BELIVER,"
+					+ "(SELECT COUNT(DISTINCT(STRG_CODE)) FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=MR.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-') AS NOT_SHOW_BELIVER, " +
+					"(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='H' 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_BELIVER,"
+					+ "(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='H' 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(*) = 2) AS VISITED_TWICE_BELIVER, " +
+					"(SELECT COUNT(COUNT(*)) AS COUNT FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=EMP.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=? AND STRG_CODE!='-NA-''31-05-2018' GROUP BY STRG_CODE HAVING COUNT(*) >= 3) AS VISITED_THREE_BELIVER,"
+					+ "(SELECT COUNT(*) FROM STRG_MEET WHERE STRG_CLASS_CODE='H' AND SALES_PERS=EMP.EMP_CODE AND STRG_TYPE='D' AND EVENT_DATE>=? AND EVENT_DATE<=?  AND STRG_CODE!='-NA-' and EVENT_TYPE='PR') AS PR_BELIVER_DOCTOR, " +
+					"(SELECT COUNT(*) FROM STRG_SERIES SS INNER JOIN STRG_STATUS_HIST SSH ON SS.SALES_PERS=SSH.SALES_PERS AND SS.SC_CODE=SSH.SC_CODE WHERE SS.SALES_PERS=MR.EMP_CODE AND SSH.STATUS='Y' AND SS.CUST_TYPE='C' AND SSH.EFF_FROM<=? AND SSH.VALID_UPTO>=?) AS TOTALRETAILER_COUNT,"
+					+ "(SELECT COUNT(DISTINCT(STRG_CODE)) FROM STRG_MEET SM WHERE SM.SALES_PERS=MR.EMP_CODE AND SM.STRG_TYPE='C' AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND strg_code!='-NA-') AS MET_COUNT, " +
+					"(SELECT COUNT(*) FROM STRG_MEET SM WHERE SM.SALES_PERS=MR.EMP_CODE AND SM.STRG_TYPE='C' AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND strg_code!='-NA-') AS TOTAL_CALLS_RETAILER,"
+					+ "(SELECT SUM(VALUE) FROM STRG_MEET_ORDER SO,STRG_MEET SM  WHERE SO.TRAN_ID=SM.TRAN_ID AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=? AND SM.SALES_PERS=EMP.EMP_CODE AND SM.STRG_TYPE='C') AS TOTAL_POB_DAY, " +
+					"(SELECT COUNT(*) AS COUNT FROM STRG_ITEM_DISPLAY SDI,STRG_MEET SM WHERE SDI.TRAN_ID=SM.TRAN_ID AND SM.EVENT_DATE>=? AND SM.EVENT_DATE<=?  AND SM.SALES_PERS=MR.EMP_CODE AND STRG_TYPE='C') AS DISPLAY_COUNT"
+					+ " FROM ORG_STRUCTURE EMP ,ORG_STRUCTURE MGR, ORG_STRUCTURE HO , EMPLOYEE MR WHERE  EMP.EMP_CODE = MR.EMP_CODE AND EMP.POS_CODE__REPTO = MGR.POS_CODE AND MGR.POS_CODE__REPTO = HO.POS_CODE AND EMP.EMP_CODE IN "+getFormattedUserId(teamArgs)+"";
 			mStatement = mConnection.prepareStatement(query);
 			mStatement.setDate(1, java.sql.Date.valueOf(fromDate) );
 			mStatement.setDate(2, java.sql.Date.valueOf(toDate) );
@@ -127,6 +146,16 @@ public class EsiKpiReportEJB extends ValidatorEJB implements EsiKpiReportEJBLoca
 			mStatement.setDate(46, java.sql.Date.valueOf(toDate) );
 			mStatement.setDate(47, java.sql.Date.valueOf(fromDate) );
 			mStatement.setDate(48, java.sql.Date.valueOf(toDate) );
+			//added by mrunalini sinkar on 12-june-2018 to add status hist condtion in quert(start)
+			mStatement.setDate(49, java.sql.Date.valueOf(fromDate) );
+			mStatement.setDate(50, java.sql.Date.valueOf(toDate) );
+			mStatement.setDate(51, java.sql.Date.valueOf(fromDate) );
+			mStatement.setDate(52, java.sql.Date.valueOf(toDate) );
+			mStatement.setDate(53, java.sql.Date.valueOf(fromDate) );
+			mStatement.setDate(54, java.sql.Date.valueOf(toDate) );
+			mStatement.setDate(55, java.sql.Date.valueOf(fromDate) );
+			mStatement.setDate(56, java.sql.Date.valueOf(toDate) );
+			//added by mrunalini sinkar on 12-june-2018 to add status hist condtion in quert(start)						
 			
 			mResultSet = mStatement.executeQuery();
 			while(mResultSet.next())
@@ -310,6 +339,7 @@ public class EsiKpiReportEJB extends ValidatorEJB implements EsiKpiReportEJBLoca
 		System.out.println("returnJsonArr:::["+returnJsonArr+"]");
 		return returnJsonArr.toString();
 	}
+	//added by mrunalini sinkar for Esi KPI Report(end)
 	public static String getFormattedUserId( String userId )
 	{
 		StringBuffer userIdSql = new StringBuffer();