i have done changes for BK job count

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

webitm-dashboard/ibase/dashboard/common/hibernate/dao/UserHistoryDAO.java

@@ -25,6 +25,7 @@ import ibase.system.config.ConnDriver;
 import ibase.utility.BaseLogger;
 import ibase.utility.E12GenericUtility;
 import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.BckgrndProcessEJB;
 import ibase.webitm.ejb.DBAccessEJB;
 import ibase.webitm.utility.ITMException;
 
@@ -615,7 +616,7 @@ public class UserHistoryDAO
 
 		// getBkJobsCount Created By Yogesh Mohite 10/10/2019
 		public String getBkJobsCount(String loginUser, String transDB)throws Exception {
-			System.out.println("indside getTagscountt");
+			System.out.println("indside getbkJobscountt");
 			java.sql.PreparedStatement pstmt = null;
 			ResultSet rs = null;
 			Connection conn = null;
@@ -629,42 +630,49 @@ public class UserHistoryDAO
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			
 			 Date date = new Date();
-			 System.out.println("Date from Method is "+ date);
+				
 			 E12GenericUtility genericUtility = new E12GenericUtility();
 			 String targetDateFormat=genericUtility.getDBDateFormat();	
 			 System.out.println("targetDateFormat :::"+targetDateFormat);
-			String Date1=genericUtility.getValidDateString(date, targetDateFormat);
+			 String Date1=genericUtility.getValidDateString(date,targetDateFormat);
+			 
 			StringBuffer sql = new StringBuffer();
-			sql.append("SELECT COUNT(*) AS COUNT ")
-							.append ("FROM") 
-							.append ("  (SELECT 'Excel' AS title,")
-							.append("    win_name,")
-							.append("    batch_id AS job_id")
-							.append("  FROM batchload")
-							.append("  WHERE load_stat IN ('N','E','Y')")
-							.append("  AND chg_user     = '" + loginUser +"'")
-							.append("  AND load_date    >TO_DATE('"+ Date1 +"','"+targetDateFormat+"')")
-							.append("  AND load_date    <TO_DATE('"+ Date1 +"','"+targetDateFormat+"')")
-							.append("  GROUP BY WIN_NAME,")
-							.append("    BATCH_ID")
-							.append("  UNION ALL")
-							.append("  SELECT (")
-							.append("    CASE")
-							.append("      WHEN obj_type = 'P'")
-							.append("      THEN 'Process'" )
-							.append("      WHEN obj_type = 'R'")
-							.append("      THEN 'Report'" )
-							.append("      ELSE 'Other'")
-							.append("    END)     AS title,")
-							.append("    obj_name AS win_name,")
-							.append("    job_id")
-							.append("  FROM background_job")
-							.append("  WHERE job_stat  IN ('I','E','X','P','C')")
-							.append("  AND user_id      = '"+loginUser +"'")
-							.append("  AND created_date > TO_DATE('"+ Date1 +"','"+targetDateFormat+"')")
-							.append("  )" );
+			sql.append("SELECT COUNT(*) AS COUNT ");
+							sql.append ("FROM");
+							sql.append ("  (SELECT 'Excel' AS title,");
+							sql.append("    win_name,");
+							sql.append("    batch_id AS job_id");
+							sql.append("  FROM batchload");
+							sql.append("  WHERE load_stat IN ('N','E','Y')");
+							sql.append("  AND chg_user     = '" + loginUser +"'");
+							if( checkNull( Date1 ).length() > 0);
+							{
+								sql.append( "AND LOAD_DATE >=TO_DATE ('"+ Date1 +"','"+targetDateFormat+"')");
+							}
+							sql.append("  GROUP BY WIN_NAME,");
+							sql.append("    BATCH_ID");
+							sql.append("  UNION ALL");
+							sql.append("  SELECT (");
+							sql.append("    CASE");
+							sql.append("      WHEN obj_type = 'P'");
+							sql.append("      THEN 'Process'" );
+							sql.append("      WHEN obj_type = 'R'");
+							sql.append("      THEN 'Report'" );
+							sql.append("      ELSE 'Other'");
+							sql.append("    END)     AS title,");
+							sql.append("    obj_name AS win_name,");
+							sql.append("    job_id");
+							sql.append("  FROM background_job");
+							sql.append("  WHERE job_stat  IN ('I','E','X','P','C')");
+							sql.append("  AND user_id      = '"+loginUser +"'");
+							if( checkNull( Date1 ).length() > 0)
+							{
+								
+								sql.append( "AND CREATED_DATE >=TO_DATE('"+ Date1 +"','"+targetDateFormat+"')");
+							}
+					
+							sql.append("  )" );
 			System.out.println("BKJobs sql.toString()+++" + sql.toString());
 			pstmt = conn.prepareStatement(sql.toString());
 			rs = pstmt.executeQuery();