Commit needful changes to avoid duplicate values in Offline download Sheet.

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

webitm-gst/ibase/webitm/ejb/gst/GSTRWebServiceDao.java

@@ -10,6 +10,9 @@ import java.sql.Timestamp;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+
+import com.fasterxml.jackson.core.io.SegmentedStringWriter;
+
 import ibase.utility.E12GenericUtility;
 
 
@@ -26,7 +29,7 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 		String remarks,subStatus,subDate,addUser,addDate,addTerm,chgUser,chgDate,chgTerm,taxRegNo,recoStatus,ecomRegNo;
 		String refSer,gstCode,gstType,refId,newftranDate,newdocDate,newaddDate,newchgDate,newlrDate,newRefDateInv,newOrderDate;
 		String newSubDate;
-		String tranIDDet,statusDet,lineTypeDet,gscodeDet;
+		String tranIDDet,statusDet,lineTypeDet,gscodeDet,refId1,tranType1;
 		
 		
 		double sgstpercDet,itcsgstDet,sgstamtDet,srnoOldDet,itcigstDet,igstamtDet,cesspercDet,itccessDet,itccgstDet;
@@ -74,7 +77,7 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 		
 		/**Added by kaustubh on 7 june 2018 start*/
 	
-		JSONObject suppParam = gstDataObj.getJSONObject("suppParam");
+		/*JSONObject suppParam = gstDataObj.getJSONObject("suppParam");
 		System.out.println("data json value"+suppParam);
 		
 				
@@ -82,6 +85,8 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 		 String toDate= suppParam.getString("toDate");
 		 String type= suppParam.getString("type");
 		 String sitecode =suppParam.getString("sitecode");
+		 String newPeriod =suppParam.getString("period");
+		 
 		 Timestamp fromDateNew = null,todateNew = null;
 		 if(fromDate != null && fromDate.trim().length() > 0)
 		  	{
@@ -94,27 +99,35 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 		  	}
 		 
 		 
-		System.out.println("fromDate In Dao["+fromDate+"toDate"+toDate+"type["+type+"]"+"sitecode["+sitecode+"]"); 
-		
-		
-		sql = "SELECT COUNT(1) AS CNT FROM gst_data_hdr WHERE tran_date between ? and ? ";
-		
-		pstmt = conn.prepareStatement(sql);
-		pstmt.setTimestamp(1, fromDateNew);
-		pstmt.setTimestamp(2,todateNew);
-		
+		System.out.println("fromDate In Dao["+fromDate+"toDate"+toDate+"type["+type+"]"+"sitecode["+sitecode+"]"+"period["+newPeriod+"]"); 
+	
+		sql = " SELECT count(*) FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P'  and site_code = ?  and PRD_CODE= ? and REC_TYPE= ? ";
+	    pstmt = conn.prepareStatement(sql);
+		pstmt.setString(1, sitecode);
+		pstmt.setString(2, newPeriod);
+		if ("S".equalsIgnoreCase(type))
+		{
+			pstmt.setString(3, "1");
+		}
+		else
+		{
+			pstmt.setString(3, "2");
+		}
+		System.out.println("query::"+pstmt);
 		rs = pstmt.executeQuery();
-		
-		while(rs.next())
+
+		if(rs.next())
 		{
-			dataCount = rs.getInt("CNT");
+			dataCount = rs.getInt(1);
+			
 		}
-		if(pstmt != null)
+		
+		 if(pstmt != null)
 		{
-			pstmt.close();
-			pstmt = null;
+    		pstmt.close();
+    		pstmt = null;
 		}
-		if(rs!=null)
+		if(rs != null)
 		{
 			rs.close();
 			rs = null;
@@ -125,7 +138,7 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 		if (dataCount > 0)
 		{
 			sql="delete from gst_data_det where tran_id in " +
-				"(select tran_id from gst_data_hdr where  rec_type= ? and site_code= ? and CHG_DATE between ? and ?  )";	
+				"(select tran_id from gst_data_hdr where  rec_type= ? and site_code= ? and PRD_CODE= ?  )";	
 					
 				pstmt = conn.prepareStatement(sql);
 				
@@ -141,6 +154,7 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 				pstmt.setString(2,sitecode);
 				pstmt.setTimestamp(3,fromDateNew);
 				pstmt.setTimestamp(4,todateNew);
+				pstmt.setString(3,newPeriod);
 				
 				int detCount = pstmt.executeUpdate();
 				
@@ -151,7 +165,7 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 				}		
 				System.out.println("No of Detail Records Deleted ::"+detCount);
 				
-				sql = "delete  FROM GST_DATA_HDR WHERE rec_type= ? and site_code= ? and CHG_DATE between ? and ? " ; 
+				sql = "delete  FROM GST_DATA_HDR WHERE rec_type= ? and site_code= ? and PRD_CODE= ?  " ; 
 					
 				pstmt = conn.prepareStatement(sql);
 				
@@ -165,6 +179,7 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 				}
 				
 				pstmt.setString(2,sitecode);
+				pstmt.setString(3,newPeriod);
 				pstmt.setTimestamp(3,fromDateNew);
 				pstmt.setTimestamp(4,todateNew);
 				
@@ -176,11 +191,89 @@ public class GSTRWebServiceDao  extends ValidatorEJB {
 					pstmt = null;
 				}
 				System.out.println("No of records deleted from header table ::"+hdrCount);
-		}
+		}*/
 		
 		/**Added by kaustubh on 7 june 2018 start*/
 				
+	
+		/**Added by kaustubh on 18 june 2018 start*/
+		
+		System.out.println("json data"+gstDataObj);
+		
+		JSONObject syncData =gstDataObj.getJSONObject("data");
+		System.out.println("SYNC Data::"+syncData);
+		
+		JSONArray exsitingHdr = syncData.getJSONArray("hdr");
+		for(int i=0;i<exsitingHdr.length();i++)
+		{
+	        JSONObject obj1 = exsitingHdr.getJSONObject(i);
+	        refId1=obj1.getString("refid");
+	        tranType1=obj1.getString("trantype");
+	        System.out.println("tranType1["+tranType1+"]"+"refId1["+refId1+"]");
+	        
+	        sql ="select count(*) from gst_data_hdr where ref_id = ? and tran_type = ? ";
+	        pstmt =conn.prepareStatement(sql);
+	        
+	        pstmt.setString(1,refId1);
+	        pstmt.setString(2,tranType1);
+	        
+	        rs = pstmt.executeQuery();
+		     if ( rs.next() )
+		     {
+		    	 dataCount = rs.getInt(1);
+		     }
+		     System.out.println("dataCount["+dataCount+"]");
+	        
+	        if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}		
+	        
+	        if(rs!=null)
+		     {
+		    	 rs.close();
+		    	 rs=null;
+		     }
+	        if (dataCount  > 0)
+	        {
+		        sql = "delete from gst_data_det where tran_id in "
+		        	+"(select tran_id from gst_data_hdr where ref_id = ? and tran_type = ?)";	
+		        pstmt = conn.prepareStatement(sql);
+		        
+		        pstmt.setString(1,refId1);
+		        pstmt.setString(2,tranType1);
+		        
+		        int detCount = pstmt.executeUpdate();
+				
+				if(pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}		
+				System.out.println("No of Detail Records Deleted ::"+detCount);
+				
+				sql = "delete  FROM GST_DATA_HDR where ref_id = ? and tran_type = ?  " ; 
 				
+				pstmt = conn.prepareStatement(sql);
+				
+			 	pstmt.setString(1,refId1);
+		        pstmt.setString(2,tranType1);
+				
+				int hdrCount = pstmt.executeUpdate();
+				
+				if(pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				System.out.println("No of records deleted from header table ::"+hdrCount);
+	        }
+		}
+		
+		/**Added by kaustubh on 18 june 2018 End */
+
+		
 		System.out.println("json data"+gstDataObj);
 		
 		JSONObject dataObj =gstDataObj.getJSONObject("data");