Sana S: Modified on 12/11/19

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

webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java

@@ -20,6 +20,8 @@ import ibase.webitm.utility.ITMException;
 //Created by Sana Shaikh on 06/09/2019 for Cadre Wise Perk  [START]
 public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, CadreWisePerkRemote
 {
+	E12GenericUtility genericUtility = null;
+
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag,
 			String xtraParams) throws RemoteException, ITMException
 	{ 
@@ -28,7 +30,6 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 		Document dom1 = null;
 		Document dom2 = null;
 		String errString = "";
-		E12GenericUtility genericUtility = null;
 
 		try {
 			genericUtility = new E12GenericUtility();
@@ -98,8 +99,8 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 		{
 			genericUtility = new E12GenericUtility();
 			itmDbAcess = new ITMDBAccessEJB();
-			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
-
+			//SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); //Modified by Sana S on 08/11/19
+			SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy");
 			conn = getConnection();
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			System.out.println("Line no----");
@@ -355,6 +356,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 						else if ("eff_date".equalsIgnoreCase(childNodeName))
 						{
 							effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
+							System.out.println("effDateStr  ::::"+effDateStr);
 							if(effDateStr == null || effDateStr.trim().length() == 0)
 							{
 								errCode="VTDATE11";
@@ -371,6 +373,9 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 							Date effDate = sdf.parse( effDateStr );
 							Date expDate = sdf.parse( expDateStr );
 
+							System.out.println("effDate  ::::"+effDate);
+							System.out.println("expDate  ::::"+expDate);
+
 							if(expDateStr == null || expDateStr.trim().length() == 0)
 							{
 								errCode="VTDATE22";
@@ -418,13 +423,16 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 								errFields.add(childNodeName.toLowerCase());
 							}
 						}
-						////added by sana s on 17/10/19  [start]
+						//Comment by Sana S on 12/11/19 [start]
+						/*////added by sana s on 17/10/19  [start]
 						mval  = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
 						mval1 = checkNull(genericUtility.getColumnValue("ad_code",dom));
 						String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
 						String cadreCode=checkNull(genericUtility.getColumnValue("cadre_code",dom));
 						effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
-						
+
+						System.out.print("effDateStr at 433:"+effDateStr);
+
 						sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ? and eff_date = ?";
 
 						pstmt = conn.prepareStatement(sql);
@@ -456,7 +464,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 							errFields.add(childNodeName.toLowerCase());
 						}
 						////////added by sana s on 17/10/19  [end]
+*/	
+						//Comment by Sana S on 12/11/19 [start]	
 					}
+					
 					break;
 				}
 			}
@@ -591,11 +602,15 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 		Date proccFor=null,nextProcDate=null;
 		String nextProcDate1=null;
 		UtilMethods utilMethods=new UtilMethods();
-		SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yy");
+
+		SimpleDateFormat sdf;
 
 		try
 		{
+
 			genericUtility = new E12GenericUtility();
+			//sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			sdf = new SimpleDateFormat("dd/MM/yy"); // Modified by Sana S on 08/11/19
 			System.out.println("currentFormNo...." + currentFormNo);
 			conn = getConnection();
 			if (objContext != null && objContext.trim().length() > 0) 
@@ -674,16 +689,24 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 				else if ("last_proc_for".equalsIgnoreCase(currentColumn)) 
 				{
 					lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
-					System.out.println("lastProcFor"+lastProcFor);
-					proccFor=sdf.parse(lastProcFor);
-					System.out.println("proccFor"+proccFor);
+					System.out.println("lastProcFor"+lastProcFor.length());
+					if (!lastProcFor.equals(null) || !lastProcFor.equals("") || lastProcFor.length() > 0) 
+					{
+						proccFor=sdf.parse(lastProcFor);
+						System.out.println("proccFor"+proccFor);
 
-					cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
-					nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
+						cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
+						nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
 
-					nextProcDate1=sdf.format(nextProcDate);
-					System.out.println("Date  ::::"+nextProcDate1);
-					valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
+						nextProcDate1=sdf.format(nextProcDate);
+						System.out.println("Date  ::::"+nextProcDate1);
+						valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
+					}
+					else
+					{
+						valueXmlString.append("<next_proc_date><![CDATA[").append("")
+						.append("]]></next_proc_date>\r\n");
+					}
 				}
 				else if ("cycle_time".equalsIgnoreCase(currentColumn)) 
 				{