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

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

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

@@ -43,7 +43,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 {
 	
 @Override
-	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String forced_flag) throws RemoteException,ITMException
+	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String fromDateStr,String toDateStr, String forced_flag) throws RemoteException,ITMException
 	{
 	    System.out.println("Json for gst table data transfer called");
 		Document dom = null;
@@ -60,7 +60,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 			}
 			*/
 		     	System.out.println("TRAN id:"+tran_id+":");
-			  resString = getGstTableData(tran_id,xtraParams,sitecode, period, type,forced_flag);
+			  resString = getGstTableData(tran_id,xtraParams,sitecode, period, type,fromDateStr,toDateStr,forced_flag);
 			
 		}catch(Exception e)
 		{
@@ -73,13 +73,13 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 	}
 
  	//Changed by wasim on to overload getGstTableData with connection parameter [START]
- 	public String getGstTableData(String tran_id, String xtraParams ,String sitecode, String period, String type, String forced_flag) throws Exception
+ 	public String getGstTableData(String tran_id, String xtraParams ,String sitecode, String period, String type, String fromDateStr,String toDateStr, String forced_flag) throws Exception
 	{
  		String retString = "";
  		Connection conn = null;
  		try
  		{
- 			retString = getGstTableData(tran_id, xtraParams,forced_flag,sitecode,period,type, conn);
+ 			retString = getGstTableData(tran_id, xtraParams,forced_flag,sitecode,period,type,fromDateStr,toDateStr, conn);
  		}
  		catch(Exception e)
  		{
@@ -93,11 +93,11 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 	//Changed by wasim on to overload getGstTableData with connection parameter [END]
 	
  	//public String getGstTableData(String tran_id, String xtraParams , String forced_flag) throws RemoteException,ITMException
-	public String getGstTableData(String tran_id, String xtraParams , String forced_flag,String sitecode, String period, String type, Connection conn) throws RemoteException,ITMException
+	public String getGstTableData(String tran_id, String xtraParams , String forced_flag,String sitecode, String period, String type,String fromDateStr , String toDateStr, Connection conn) throws RemoteException,ITMException
 	{
 		System.out.println("Inside GetGstTableData");
 		System.out.println("Newsitecode::"+sitecode);
-		System.out.println("New period::"+period);
+		System.out.println("New period::"+period+"from["+fromDateStr+"]"+"toDateStr["+toDateStr+"]");
 		System.out.println("New type::"+type);
 		
 		String s=period;  
@@ -445,8 +445,19 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 		            ObjectMapper objectMapper = new ObjectMapper();
 					String json = objectMapper.writeValueAsString(gstHrdDetData); 				
 					JSONObject gstr1HeaderObj = new JSONObject();
+					
+					JSONObject gstr1SupportObj = new JSONObject();
+					gstr1SupportObj.put("fromDate", fromDateStr);
+					gstr1SupportObj.put("toDate", toDateStr);
+					gstr1SupportObj.put("type", type);
+					gstr1SupportObj.put("sitecode", sitecode);
+					
 					gstr1HeaderObj.put("data", json);
+					gstr1HeaderObj.put("suppParam",gstr1SupportObj);
+					
+					
 					
+					System.out.println("json values in getGSTValue"+gstr1HeaderObj.toString());
 					
 					RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
 							                  // .setTimeouts(connectionTimeout,socketTimeout)

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

@@ -11,7 +11,7 @@ import javax.ejb.Local;
 public interface GetGstTableDataLocal extends ActionHandlerLocal{
 
 
-	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String forced_flag)throws RemoteException,ITMException;
+	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String fromdate,String todate,String forced_flag)throws RemoteException,ITMException;
 }
 	
 

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

@@ -14,7 +14,7 @@ public interface GetGstTableDataRemote extends ActionHandlerRemote {
 
 	
 
-	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String synctype , String forced_flag) throws RemoteException,ITMException;
+	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String synctype ,String fromdate, String todate, String forced_flag) throws RemoteException,ITMException;
 }