Add new field "valid_upto" in Bank Reconciliation screen as per requirement.

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

webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java

@@ -301,6 +301,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
 					//siteCode = checkNull(genericUtility.getColumnValue("site_code",dom));
 					bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom));
 					//String validuptoDt = genericUtility.getColumnValue("valid_upto",dom);
+					
+					
+			       //Added By PriyankaC on 14Sept2018
+					validupto = genericUtility.getColumnValue("valid_upto",dom);
+					System.out.println("validupto :"+validupto);
+					if(validupto !=null && validupto.trim().length() > 0)
+					{
+					validupto = genericUtility.getValidDateTimeString( validupto, "dd-MMM-yyyy",genericUtility.getDBDateFormat() );
+					System.out.println("validupto :"+validupto);
+					}
 					System.out.println("bankCode :"+bankCode);
 					System.out.println("validupto in case 2 :"+validupto);
 					sql = "select site_code from bank where bank_code = ?";
@@ -394,8 +404,12 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
 					bankCode = genericUtility.getColumnValue("bank_code",dom1);
 					validupto = genericUtility.getColumnValue("valid_upto",dom1);
 					System.out.println("validupto :"+validupto);
+					
+					if(validupto !=null && validupto.trim().length() > 0)
+					{
 						validupto = genericUtility.getValidDateTimeString( validupto, "dd-MMM-yyyy",genericUtility.getDBDateFormat() );
 						System.out.println("validupto :"+validupto);
+					}
 					
 					filterxml = genericUtility.getColumnValue("filter_xml", dom1);
 					System.out.println("filterxml :"+filterxml);
@@ -619,7 +633,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
 				System.out.println("bankCode :"+bankCode);
 				//Added By PriyankaC on 14Sept2018
 				validupto = genericUtility.getColumnValue("valid_upto",dom);
+				if(validupto !=null && validupto.trim().length() > 0)
+				{
 					validupto = genericUtility.getValidDateTimeString( validupto, "dd-MMM-yyyy",genericUtility.getDBDateFormat() );
+				}
 					System.out.println("validupto :"+validupto);
 				/*
 				if(reconcileType.equalsIgnoreCase("filter")){
@@ -3060,8 +3077,12 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
 			
 			bankCode = checkNull(genericUtility.getColumnValue("bank_code", dom));
 			System.out.println("bank code:::"+bankCode);
-			validupto = genericUtility.getColumnValue("valid_upto",dom1);
-			validupto = genericUtility.getValidDateTimeString( validupto, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() );
+			validupto = genericUtility.getColumnValue("valid_upto",dom);
+			
+			if(validupto !=null && validupto.trim().length() > 0)
+			{
+				validupto = genericUtility.getValidDateTimeString( validupto, "dd-MMM-yyyy",genericUtility.getDBDateFormat() );
+			}
 			System.out.println("validupto :"+validupto);
 			sql = "select BANK_NAME from bank where bank_code = ?";
 			pstmt = conn.prepareStatement(sql);