Modify SQL for ReqEfficiancy Dashboard add fh.emp_code = e.emp_code to sql

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

webitm-dashboard/ibase/dashboard/iem/ejb/ManagmentDashboard.java

@@ -799,21 +799,21 @@ public class ManagmentDashboard implements ManagmentDashboardLocal, ManagmentDas
 	            	&& (toDateInTS!=null && toDateInTS.toString().length()>0) 
 	            	&& (empCode!=null && empCode.trim().length()>0) )
 			{
-				sql = "SELECT  r.comp_stat_dt,r.COMP_STAT,R.REQ_ID,R.DTL_DESCR, AD.ACTION_DETL, E.EMP_FNAME || ' ' || E.EMP_LNAME EMP_NAME, "
-					  +" AD.STD_TIME as STD_TIME ,max((SELECT FN_FEEDBK_TIME(SUM(FD.TIME_SPENT)) FROM SER_REQ_FEEDBKDTL FD, "
-					  +" SER_REQ_FEEDBK FH WHERE FD.FEEDBK_ID = FH.FEEDBK_ID AND FH.REQ_ID = R.REQ_ID "
+				sql = "SELECT  R.COMP_STAT_DT,R.COMP_STAT,R.REQ_ID,R.DTL_DESCR, AD.ACTION_DETL, E.EMP_FNAME || ' ' || E.EMP_LNAME EMP_NAME, "
+					  +" AD.STD_TIME as STD_TIME ,MAX((SELECT FN_FEEDBK_TIME(SUM(FD.TIME_SPENT)) FROM SER_REQ_FEEDBKDTL FD, "
+					  +" SER_REQ_FEEDBK FH EMPLOYEE E WHERE FD.FEEDBK_ID = FH.FEEDBK_ID AND FH.REQ_ID = R.REQ_ID "
 					  +" AND  FD.ACTION_ID = AD.ACTION_ID "
-					  +" AND FD.ACTION_CODE = AD.ACTION_CODE )) ACTUAL_TIME "
-					  +" from ser_request r, ser_req_act ah, ser_req_act_detl ad, employee e "
-					  +" where ah.action_id = ad.action_id "
-					  +" and ah.req_id = r.req_id "
+					  +" AND FD.ACTION_CODE = AD.ACTION_CODE AND FH.EMP_CODE = E.EMP_CODE)) ACTUAL_TIME "
+					  +" FROM SER_REQUEST R, SER_REQ_ACT AH, SER_REQ_ACT_DETL AD, EMPLOYEE E "
+					  +" WHERE AH.ACTION_ID = AD.ACTION_ID "
+					  +" AND AH.REQ_ID = R.REQ_ID "
 					  +" AND E.EMP_CODE =  ad.EMP_CODE "
-					  +" and r.comp_stat_dt >= ? and r.comp_stat_dt <= ?  "//--?
-					  +" AND ad.emp_code in (select emp_code FROM EMPLOYEE START WITH EMP_CODE = "+empCode+"  "      
+					  +" AND R.COMP_STAT_DT >= ? AND R.COMP_STAT_DT <= ?  "//--?
+					  +" AND AD.EMP_CODE IN (SELECT EMP_CODE FROM EMPLOYEE START WITH EMP_CODE = "+empCode+"  "      
 					  +"  CONNECT BY PRIOR EMP_CODE = REPORT_TO AND REPORT_TO IS NOT NULL "
 					  +" AND  ( RELIEVE_DATE IS NULL OR RELIEVE_DATE >= SYSDATE ))  " 
-					  +" group by r.req_id,r.dtl_descr, ad.action_detl, r.COMP_STAT,e.emp_fname || ' ' || e.emp_lname,  ad.STD_TIME ,r.comp_stat_dt " +
-					  " order by r.comp_stat_dt desc ";
+					  +" GROUP BY R.REQ_ID,R.DTL_DESCR, AD.ACTION_DETL, R.COMP_STAT,E.EMP_FNAME || ' ' || E.EMP_LNAME,  AD.STD_TIME ,R.COMP_STAT_DT " +
+					  " ORDER BY R.COMP_STAT_DT DESC ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setTimestamp(1,fromDateInTS);
 				pstmt.setTimestamp(2,toDateInTS);