Sana S : Modified on 14/01/2020

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

webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpLeaveConf.java

@@ -2,7 +2,7 @@ package ibase.webitm.ejb.adm.adv;
 
 //Changes done by Varsha V on 03-09-19 as per suggested by Sir
 //import ibase.system.config.AppConnectParm;//Added by Anjali Rawankar on[21/08/2017][For ITMDBACCESS]
-//import ibase.system.config.*;
+import ibase.system.config.*;
 import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ActionHandlerEJB;
@@ -11,7 +11,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB;//Added by sarita on[20/07/2018][For ITMD
 import ibase.webitm.ejb.adm.AdmCommon;
 import ibase.webitm.ejb.adm.AttdProcess;
 import ibase.webitm.ejb.adm.LeaveEncase;
-//import ibase.webitm.ejb.dis.DistCommon;
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.fin.FinCommon;
 import ibase.webitm.ejb.hrp.leave.EmpLeaveIC;
 import ibase.webitm.ejb.sys.UtilMethods;
@@ -31,11 +31,12 @@ import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
-//import java.util.List;
+import java.util.List;
 
 import javax.ejb.Stateless;
-//import javax.naming.InitialContext;//Added by Anjali Rawankar on[21/08/2017][For ITMDBACCESS]
+import javax.naming.InitialContext;//Added by Anjali Rawankar on[21/08/2017][For ITMDBACCESS]
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -46,14 +47,14 @@ import org.w3c.dom.NodeList;
 @Stateless
 public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,EmpLeaveConfRemote
 {
-	private UtilMethods utilMethod = null ;
+	public UtilMethods utilMethod = null ;
 	private AdmCommon admCommon = null;
 	private E12GenericUtility genericUtility = null;
 	private String errXml ="";
 	private String termId = "",loginEmpCode = "",userId = "";
-	private HashMap lveRuleList = null;
-	private ArrayList errList = null;
-	private ArrayList fldList = null;
+	public HashMap lveRuleList = null;
+	public ArrayList errList = null;
+	public ArrayList fldList = null;
 	private String xtraParamsArg = "";
 	private String leaveXmlData = "";
 	private ProteusDataSource proteusDataSource = null;
@@ -3711,7 +3712,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 			//Modified by Anjali R. on[20/09/2018][To get todays date][End]
 			
 			//Added by Sana S on 08/01/2020 [start]
-			Timestamp todayDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(String.valueOf(todaysDate),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
+			//Timestamp todayDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(String.valueOf(todaysDate),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));//Commented by Sana S on 14/01/2020
 			//Added by Sana S on 08/01/2020 [end]
 			
 			mAmt = 0;
@@ -4772,16 +4773,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 					//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][Start]
 					//pstmt.setTimestamp(2, mDate3);
 					//Modifeid by Sana S on 14/10/19
-					//pstmt.setTimestamp(2, todaysDate);
-					pstmt.setTimestamp(2, todayDate);
+					pstmt.setTimestamp(2, todaysDate);////Modified by Sana S on 14/01/2020
+					//pstmt.setTimestamp(2, todayDate);
 					//end
 					//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][End]
 					pstmt.setString(3,loginEmpCode);
 					pstmt.setString(4,null);
 					//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
 					//pstmt.setTimestamp(5,chgTime);
-				    //pstmt.setTimestamp(5, todaysDate);
-					pstmt.setTimestamp(5, todayDate);
+				    pstmt.setTimestamp(5, todaysDate);////Modified  by Sana S on 14/01/2020
+					//pstmt.setTimestamp(5, todayDate);
 					//end
 					//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
 					pstmt.setString(6, tranId);