Changes made to generate and download data excel file in custom format for GSTR1 and GSTR2

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

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

@@ -5300,14 +5300,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		
 		boolean noDataFound = false;
 		double amount =0.0, gstRate = 0.0, taxableAmt = 0.0, cessAmt = 0.0;
-		int outWrdSuppdataRow = 4, inWrdSuppdataRow = 4, crdrPaydataRow = 4, crdrRecdataRow = 4;
+		int outWrdSuppdataRow = 2, inWrdSuppdataRow = 2, crdrPaydataRow = 2, crdrRecdataRow = 2;
 		double igstAmt = 0.0, cgstAmt = 0.0, sgstAmt = 0.0; 
 		
 		HashMap<String,String> stateCodeHMap = new HashMap<String, String>();
 		
-		Calendar calendar = Calendar.getInstance();
-		calendar.set(2017, 06, 01);
-		Date gstStartDate = calendar.getTime();
 		
 		String sql = "", hdrSql = "", detSql = "";
 		Date refInvDate = null , docDate = null;
@@ -5317,6 +5314,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		FinCommon finCommon = new FinCommon();
 		try
 		{
+			Calendar calendar = Calendar.getInstance();
+			calendar.set(2017, 06, 01);
+			Date gstStartDate = calendar.getTime();
+
 			conn = getConnection();
 			
 			sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ? AND REC_TYPE IN ('1','2')";
@@ -5641,13 +5642,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					if(refInvDate!=null)
 					{
 						refInvDtStr = gstDateFormatSdf.format(refInvDate);
-					}
-					if(refInvDate!=null)
-					{
 						preGST = refInvDate.before(gstStartDate) ? "Y" : "N";
 					}
 					else
 					{
+						refInvDtStr = "";
 						preGST = "";
 					}
 					
@@ -5744,16 +5743,15 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					{
 						regUreg = "REGISTERED"; 
 					}
+					
 					if(refInvDate!=null)
 					{
 						refInvDtStr = gstDateFormatSdf.format(refInvDate);
-					}
-					if(refInvDate!=null)
-					{
 						preGST = refInvDate.before(gstStartDate) ? "Y" : "N";
 					}
 					else
 					{
+						refInvDtStr = "";
 						preGST = "";
 					}