commited new changes regarding SYNC Status Screen

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

webitm-gst-client/ibase/webitm/ejb/gstclient/viewGstDataStatus.java

@@ -57,7 +57,7 @@ public class viewGstDataStatus extends ProcessEJB implements viewGstDataStatusLo
 		System.out.println("******************* Kaustubh Dabholkar *******************");
 		System.out.println("----------- Inside viewGstDataStatus -----------");	
 		
-		String prdCode = "",fromDate = "", toDate = "",sql = "",tranType = "", operatingSite = "", dataSyncStatus = "", 
+		String prdCode = "",fromDate = "", toDate = "",lognSiteCode = "",sql = "",tranType = "", operatingSite = "", dataSyncStatus = "", 
 			   noOfRecords= "", xmlRetString = "", errString = "";
 		int rows = 0;
 		Connection conn = null;
@@ -81,28 +81,27 @@ public class viewGstDataStatus extends ProcessEJB implements viewGstDataStatusLo
 			prdCode = genericUtility.getColumnValue("prd_code", dom);
 			fromDate = genericUtility.getColumnValue("from_date", dom);
 			toDate = genericUtility.getColumnValue("to_date", dom);
+			lognSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
 			
-			System.out.println("prdCode::"+prdCode+"fromDate::"+fromDate+"toDate::"+toDate);
+			System.out.println("prdCode::"+prdCode+"fromDate::"+fromDate+"toDate::"+toDate+"lognSiteCode::"+lognSiteCode);
 		
 			String one = prdCode.substring(0,4);
     		String period1=prdCode.substring(4,6)+one;
     		System.out.println("two::"+period1 );
 		
-			
-			sql = "select (Select CASE WHEN  rec_type=1 THEN 'Sale_Outward_Transactions' " + 
-					"WHEN rec_type=2   THEN 'Purchase_Inward_Transactions' END CASE from dual) Transaction_Type, " + 
-					"site_code Operating_site, " + 
-					"(Select CASE WHEN  submit_status='Y' THEN 'Synced Successfully' " + 
-					"WHEN submit_status='P'  THEN 'Data Processed Pending To Sync' END CASE from dual) Data_Sync_Status, " + 
-					"count(submit_status ) Number_Of_Records from gst_data_hdr  where PRD_CODE= ? " + 
-					"group by rec_type,site_code,submit_status " + 
-					"order by rec_type,site_code " ;
-			
-			
+			sql = "SELECT (SELECT CASE WHEN gdh.rec_type=1 THEN 'Sale_Outward_Transactions'\n" + 
+					"WHEN gdh.rec_type=2 THEN 'Purchase_Inward_Transactions' END CASE FROM dual) Transaction_Type,\n" + 
+					"gdh.site_code Operating_site, (SELECT CASE WHEN gdh.submit_status='Y' THEN 'Synced Successfully'\n" + 
+					"WHEN gdh.submit_status='P' THEN 'Data Processed Pending To Sync'END CASE FROM dual) Data_Sync_Status,\n" + 
+					"COUNT(gdh.submit_status ) Number_Of_Records FROM gst_data_hdr gdh, SITEREGNO s\n" + 
+					"WHERE gdh.PRD_CODE= ? and s.site_code= ? and gdh.site_code = s.reg_no\n" + 
+					"GROUP BY gdh.rec_type,gdh.site_code,gdh.submit_status\n" + 
+					"ORDER BY gdh.rec_type, gdh.site_code" ;
 			
 					
 			pstmt = conn.prepareStatement(sql);					
-			pstmt.setString(1, period1);									
+			pstmt.setString(1, period1);	
+			pstmt.setString(2, lognSiteCode);
 			rs = pstmt.executeQuery();
 			System.out.println(">>>-GetData SQL :: ["+sql+"]");
 			while(rs.next())