In case of selective period if feedback exists in that period then only show the work allocation

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

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

@@ -1071,7 +1071,7 @@ public class ManagmentDashboard implements ManagmentDashboardLocal, ManagmentDas
 		SimpleDateFormat convertToDbDate=null;
 		SimpleDateFormat simpleDateFormat=null;
 		DashboardUtility dashboardUtility=null;
-		String dateInpute="";
+		String dateInpute="", dateInpute1 = "";
 		try
 		{
 			conn = connDriver.getConnectDB(dataSourceName);
@@ -1102,7 +1102,10 @@ public class ManagmentDashboard implements ManagmentDashboardLocal, ManagmentDas
 				//toDateInTs         = java.sql.Timestamp.valueOf(convertToDbDate.format(simpleDateFormat.parse(toDate)).toString() + " 00:00:00.0");
 				frmDateInTs= Timestamp.valueOf(genericUtility.getValidDateString(fromDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
 				toDateInTs= Timestamp.valueOf(genericUtility.getValidDateString(toDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
-				dateInpute         =" and h.TRAN_DATE >= ?  AND h.TRAN_DATE <= ?";
+				//dateInpute         =" and h.TRAN_DATE >= ?  AND h.TRAN_DATE <= ?";
+				
+				dateInpute = "and (select count(1) from SER_REQ_FEEDBK f where f.req_id = h.req_id and f.execut_dt ?  AND  ? ) > 0 ";
+				dateInpute1 = "and (select count(1) from SER_REQ_FEEDBK f where f.ticket_no = h.ticket_no and f.execut_dt ?  AND  ? ) > 0 ";
 			}
 			System.out.println("getWorkAlloSummary frmDateInTs  :"+frmDateInTs +"---- toDateInTs :"+toDateInTs);
 			
@@ -1162,7 +1165,7 @@ public class ManagmentDashboard implements ManagmentDashboardLocal, ManagmentDas
 				" AND iiid.action_code = d.action_code AND iiih.emp_code = d.emp_code ) emp_time_spent FROM service_complaint r ,ser_req_act h ,ser_req_act_detl d WHERE" +
 				" d.action_id = h.action_id AND r.ticket_no = h.ticket_no AND r.STATUS <> 'C' AND ( ( d.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 ) ) ) " +
-				" OR (d.emp_code = "+empCode+") ) "+ dateInpute +" GROUP BY d.emp_code ,r.ticket_no ,r.cust_code ,r.TICKET_DETAIL ,d.action_code , " +
+				" OR (d.emp_code = "+empCode+") ) "+ dateInpute1 +" GROUP BY d.emp_code ,r.ticket_no ,r.cust_code ,r.TICKET_DETAIL ,d.action_code , " +
 				" h.action_id,d.STD_TIME ,d.ACTION_DETL ) i ,employee e ,customer cc WHERE i.emp_code = e.emp_code AND cc.cust_code = i.cust_code " +
 				" GROUP BY e.emp_fname || ' ' || e.emp_lname ,i.req_id ,i.dtl_descr ,i.cust_code ,cc.cust_name ,i.plan_start_date ,i.act_start_date ,i.plan_end_date ," +
 				" I.STD_TIME ,I.ACTION_DETL ORDER BY e.emp_fname || ' ' || e.emp_lname ,i.req_id ";