Sana S: Modified on 07/01/2020

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

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

 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.AppConnectParm;//Added by Anjali Rawankar on[21/08/2017][For ITMDBACCESS]
 import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ActionHandlerEJB;
@@ -31,7 +29,6 @@ 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;
 
@@ -47,14 +44,14 @@ import org.w3c.dom.NodeList;
 @Stateless
 public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,EmpLeaveConfRemote
 {
-	public UtilMethods utilMethod = null ;
+	private UtilMethods utilMethod = null ;
 	private AdmCommon admCommon = null;
 	private E12GenericUtility genericUtility = null;
 	private String errXml ="";
 	private String termId = "",loginEmpCode = "",userId = "";
-	public HashMap lveRuleList = null;
-	public ArrayList errList = null;
-	public ArrayList fldList = null;
+	private HashMap lveRuleList = null;
+	private ArrayList errList = null;
+	private ArrayList fldList = null;
 	private String xtraParamsArg = "";
 	private String leaveXmlData = "";
 	private ProteusDataSource proteusDataSource = null;
@@ -825,7 +822,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 			 */
 			//Modified by Anjali R. on [03/06/2019][Start] 
 			//returnValue =  boEmpleave.checkNegAdvLveRules(leaveDom, allowAdvleave, workSite,cadre,grade,lveTable, "C",this.lveRuleList, conn); 
-		//	returnValue =  boEmpleave.checkNegAdvLveRules(allowAdvleave, workSite,cadre,grade,lveTable, "C",this.lveRuleList, conn);
+			//returnValue =  boEmpleave.checkNegAdvLveRules(allowAdvleave, workSite,cadre,grade,lveTable, "C",this.lveRuleList, conn);
 			//Modified by Anjali R. on [03/06/2019][End]
 			HashMap retHMap = boEmpleave.getClassVariables();
 			if( returnValue == -9 ) 
@@ -1436,9 +1433,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 					noRows = 0;
 					sql ="sELECT COUNT(*) AS COUNT FROM EMPLEAVE 	WHERE EMP_CODE  = ? AND LVE_DATE_FR >= ? "+
 							" AND LVE_DATE_TO <= ? AND LVE_CODE    = ? AND STATUS      = 'A' "+
-							//Commented and changed by Varsha V as per suggested by Piyush Sir on 03-09-2019
-							//" AND USE_FLAG    = 'C' AND TRAN_ID <> NVL(?,' ')";
-							" AND USE_FLAG    = 'C' AND TRAN_ID <> ?";
+							" AND USE_FLAG    = 'C' AND TRAN_ID <> NVL(?,' ')";
 					pstmt = connectionObject.prepareStatement(sql);
 					pstmt.setString(1,memp);
 					pstmt.setTimestamp(2,lveFrDt);
@@ -3625,7 +3620,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 		return errCode;
 	}
 
-	public String leavesApprove(String tranId , int saveFlag,String payrollOrVoucher,String payrollPeriod,int commit, Connection connectionObject) throws RemoteException,ITMException
+	private String leavesApprove(String tranId , int saveFlag,String payrollOrVoucher,String payrollPeriod,int commit, Connection connectionObject) throws RemoteException,ITMException
 	{
 
 		String museFlag = "",fVal1 = "",fVal2 = "",mStatus = "",mPrd = "",balOpt = "",site = "",period = "";
@@ -3642,8 +3637,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 		int 	mCnt = 0 ,times = 0;
 		boolean advFlag = false;
 		double 	noDays = 0, days = 0 ,noDays1 = 0;
-		java.sql.Timestamp lveTempDate1 = null,pmDate1 = null, pmDate2 = null ;/*,effDt1 = null  ,effDt2 = null;*/ // Modified by Sana S on 14/10/19
-		Date effDt1 = null  ,effDt2 = null;
+		java.sql.Timestamp lveTempDate1 = null,pmDate1 = null, pmDate2 = null ,effDt1 = null  ,effDt2 = null;
 		String	plStart = "", plEnd = "", errCd = "" ,leaveStart = "" , leaveEnd = "", lveStart = "" , lveEnd = "";
 		String 	workSite = "", grade = "", cadre = "",lveTblno = "", accum = "", extraArg = "";
 		java.sql.Timestamp cfDate = null, cfDatelist[] = null; 
@@ -3651,7 +3645,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 		boolean isError = false;
 		
 		//Modified by Anjali R. on[20/09/2018][Start]
-		Date todaysDate = null;
+		java.sql.Timestamp todaysDate = null;
 		//Modified by Anjali R. on[20/09/2018][End]
 		String detTranId = "";
 		String sql = "", sql1 = "", sql2 = "", sql3 = "" , sql4 = "", sql5 = "", sql6 = "", sql7 = "";
@@ -3677,41 +3671,22 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 		
 		// Modified by Anjali R. on 11/06/2019 [To track no of days adjusted in summary and balance days to be adjusted as some time weekly offs get changed afterwords][Start]
 		double	lcLveSumTotdays = 0.0;
-		
 		// Modified by Anjali R. on 11/06/2019 [To track no of days adjusted in summary and balance days to be adjusted as some time weekly offs get changed afterwords][End]		
-			
-		// added by Sana S on 14/10/19[start]
-		errList=new ArrayList<>();
-		fldList= new ArrayList<>();
-		double balDays=0.0,ConvDays=0.0;
-		SimpleDateFormat sdf=new SimpleDateFormat("dd-MM-yy");
-		//end
-
-		
+				
 		try
 		{
-			
-			// added by Sana S on 14/10/19[start]
-			
-			admCommon=new AdmCommon();
-			lveRuleList = admCommon.createLveRuleList();
-			// added by Sana S on 14/10/19[end]
-			utilMethod=new UtilMethods();
 			empLeave = new EmpLeaveIC();
 			System.out.println("================Inside Leaves approve==============");
 			//connectionObject = getConnection();
-			/*chgTime = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now());
-			mDate3 = utilMethod.dateTime(utilMethod.todaySqlDate());*/
-			errCode = null;
-			chgTime = utilMethod.dateTime(utilMethod.today(),utilMethod.now());
-			mDate3 = utilMethod.dateTime(utilMethod.today());
+			chgTime = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now());
+			mDate3 = utilMethod.dateTime(utilMethod.todaySqlDate());
 			
 			//Modified by Anjali R. on[20/09/2018][To get todays date][Start]
 			todaysDate = new java.sql.Timestamp(System.currentTimeMillis());
 			//Modified by Anjali R. on[20/09/2018][To get todays date][End]
 			
 			mAmt = 0;
-			errXml = "";
+			this.errXml = "";
 			cfDate = null;
 			do
 			{
@@ -3900,11 +3875,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 				if("Y".equalsIgnoreCase(balOpt))
 					//Modified by Anjali Rawankar on[20/09/2017][End]
 				{
-					System.out.println("lveRuleList:"+lveRuleList.get("allow_update_negative_leave"));
-
-					boolean allowUpdateNegLeave = (boolean) lveRuleList.get("allow_update_negative_leave");
+					boolean allowUpdateNegLeave =  (Boolean)this.lveRuleList.get("allow_update_negative_leave");
 					if(allowUpdateNegLeave == true && museFlag.equals("C"));
 					{
+						errCode = "";
 						errCode = checkEffectiveBalRecord(tranId,mEmp,mLveCode,mDate1,mDate2 , connectionObject);
 						if((errCode != null) && errCode.trim().length() > 0)
 						{
@@ -4128,12 +4102,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 									isError = true;
 									break;
 								}
-								//Added by Sana S on 07/11/19 [start]
-								if(noRows > 0)
-								{
-									connectionObject.commit();
-								}
-								//Added by Sana S on 07/11/19 [end]
 							}
 							else
 							{
@@ -4281,12 +4249,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 									isError = true;
 									break;
 								}
-								//Added by Sana S on 07/11/19 [start]
-								if(noRows>0)
-								{
-									connectionObject.commit();
-								}
-								//Added by Sana S on 07/11/19 [end]
 								noRows = 0;
 								mCnt = 0;
 								sql = "SELECT COUNT(*) AS COUNT FROM EMPLVE_TRACE WHERE TRAN_ID = ? AND EFF_DATE = ? AND UPTO_DATE = ?";
@@ -4497,8 +4459,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 					noRows = 0;
 					System.out.println("tranId: ["+tranId+"]"+"mEmp: ["+mEmp+"] mLveCode: ["+mLveCode+"] noDays: ["
 							+noDays+"] period: ["+period+"] mDate1: ["+mDate1+"] mDate2: ["+mDate2+"] museFlag: ["+museFlag+"]");
-					sql7 = "INSERT INTO EMPLEAVE_SUMMARY (TRAN_ID , EMP_CODE, LVE_DATE_FR, LVE_DATE_TO, LVE_CODE, NO_DAYS,PRD_CODE,USE_FLAG ) "
-							+ "VALUES(?,?,?,?,?,?,?,?)";
+					sql7 = "INSERT INTO EMPLEAVE_SUMMARY (TRAN_ID , EMP_CODE, LVE_DATE_FR, LVE_DATE_TO, LVE_CODE, NO_DAYS,PRD_CODE,USE_FLAG ) VALUES(?,?,?,?,?,?,?,?)";
 					pstmt7 = connectionObject.prepareStatement(sql7);
 					pstmt7.setString(1, tranId);
 					pstmt7.setString(2, mEmp);
@@ -4528,12 +4489,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 						isError = true;
 						break;
 					}
-					//Added by Sana S on 07/11/19 n[start]
-					if(noRows>0)
-					{
-						connectionObject.commit();
-					}
-					//Added by Sana S on 07/11/19 n[start]
 					//Modified by Anjali R. on [28/06/2019][To track no of days adjusted in summary and balance days to be adjusted as some time weekly offs get changed afterwords][Start]
 					lcLveSumTotdays = lcLveSumTotdays + noDays;
 					//Modified by Anjali R. on [28/06/2019][To track no of days adjusted in summary and balance days to be adjusted as some time weekly offs get changed afterwords][End]
@@ -4653,6 +4608,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 						java.sql.Timestamp today = null;
 						today = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.stringToTime("00:00"));
 
+
 						sql = "SELECT COUNT(1) AS COUNT FROM LEAVEBAL WHERE EMP_CODE = ?,AND LVE_CODE = ?,AND EFF_DATE <=  ?,AND UPTO_DATE >= ? ";
 						pstmt = connectionObject.prepareStatement(sql);
 						pstmt.setString( 1, mEmp);
@@ -4681,13 +4637,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 							isError = true;
 							break;
 						}
-						else  
+						else
 						{
-							//sql = "SELECT EFF_DATE,UPTO_DATE FROM LEAVEBAL WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE <= ? AND UPTO_DATE >= ?";
-							
-							//Modified by Sana S on 14/12/19
-							sql = "SELECT EFF_DATE,UPTO_DATE, BAL_DAYS,CONV_DAYS FROM LEAVEBAL WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE <= ? AND UPTO_DATE >= ?";
-							/////////////////////////end
+							sql = "SELECT EFF_DATE,UPTO_DATE FROM LEAVEBAL WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE <= ? AND UPTO_DATE >= ?";
 							pstmt = connectionObject.prepareStatement(sql);
 							pstmt.setString( 1, mEmp);
 							pstmt.setString(2, newLve);
@@ -4695,16 +4647,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 							pstmt.setTimestamp(4, toDate);
 							while (resultSet.next())
 							{
-								/*effDt1 = resultSet.getTimestamp("EFF_DATE");
-								effDt2 = resultSet.getTimestamp("UPTO_DATE");*/
-								//Added by Sana S on 14/10/19[start]
-								effDt1 = resultSet.getDate("EFF_DATE");
-								effDt2 = resultSet.getDate("UPTO_DATE");
-								balDays=resultSet.getDouble("BAL_DAYS");
-								ConvDays=resultSet.getInt("CONV_DAYS");
-								////Added by Sana S on 14/10/19[end]
-								
-								System.out.print("effective Datet1: ["+sdf.format(effDt1)+"]");
+								effDt1 = resultSet.getTimestamp("EFF_DATE");
+								effDt2 = resultSet.getTimestamp("UPTO_DATE");
 							}
 							if(resultSet != null)
 							{
@@ -4718,27 +4662,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 							}
 						}
 					}
-					
 					noRows = 0;
 					System.out.println("2. mEmp: ["+mEmp+"] newLve: ["+newLve+"] effDt1: ["+effDt1+"] effDt2: ["+effDt2+"]");
-					//Modified by Sana S on 14/10/19
-					//sql = "UPDATE LEAVEBAL SET BAL_DAYS   = BAL_DAYS + ? ,CONV_DAYS  = NVL(CONV_DAYS, 0 ) + ? WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE >= ?	AND EFF_DATE < ?";
-					sql = "UPDATE LEAVEBAL SET BAL_DAYS   = ? ,CONV_DAYS  = NVL(?, 0 ) + ? WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE >= ?	AND EFF_DATE < ?";
-					///end
+					sql = "UPDATE LEAVEBAL SET BAL_DAYS   = BAL_DAYS + ? ,CONV_DAYS  = NVL(CONV_DAYS, 0 ) + ? WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE >= ?	AND EFF_DATE < ?";
 					pstmt = connectionObject.prepareStatement(sql);
-					pstmt.setDouble( 1, balDays+mDays);
-					//Added by Sana S on 14/10/19
-					pstmt.setDouble( 2, ConvDays);
-					//end
-					pstmt.setDouble( 3, mDays);
-					pstmt.setString(4, mEmp);
-					pstmt.setString(5, newLve);
-					/*pstmt.setTimestamp(3, effDt1);
-					pstmt.setTimestamp(4, effDt2);*/
-					// Modified by Sana S on 14/10/19[start]
-					pstmt.setString(6, sdf.format(effDt1));
-					pstmt.setString(7, sdf.format(effDt2));
-					// Modified by Sana S on 14/10/19[end]
+					pstmt.setDouble( 1, mDays);
+					pstmt.setDouble( 2, mDays);
+					pstmt.setString(3, mEmp);
+					pstmt.setString(4, newLve);
+					pstmt.setTimestamp(3, effDt1);
+					pstmt.setTimestamp(4, effDt2);
 					noRows = pstmt.executeUpdate();
 					if(pstmt != null)
 					{
@@ -4748,32 +4681,29 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 					if(noRows != 1)
 					{
 						errCode = "DS000NR";
-						errList.add(errCode);
-						fldList.add("");;
+						this.errList.add(errCode);
+						this.fldList.add("");;
 						isError = true;
 						break;
 					}
 				}
 				if(saveFlag == 2)
 				{
+					
+					
 					noRows = 0;
 					sql = "UPDATE EMPLEAVE SET STATUS = 'A', ENCH_AMT = ?,STATUS_DATE = ?,EMP_CODE__APRV = ?,TRAN_ID__PAYR = ?,APRV_DATE = ? WHERE TRAN_ID = ?";
 					pstmt = connectionObject.prepareStatement(sql);
 					pstmt.setDouble(1, mAmt);
 					//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.setString(2, sdf.format(todaysDate));
-					//end
+					pstmt.setTimestamp(2, todaysDate);
 					//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][End]
-					pstmt.setString(3,loginEmpCode);
+					pstmt.setString(3,this.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.setString(5, sdf.format(todaysDate));
-					//end
+					pstmt.setTimestamp(5,todaysDate);
 					//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
 					pstmt.setString(6, tranId);
 					noRows = pstmt.executeUpdate();
@@ -4800,8 +4730,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 				if(noRows != 1)
 				{
 					errCode = "DS000NR";
-					errList.add(errCode);
-					fldList.add("");
+					this.errList.add(errCode);
+					this.fldList.add("");
 					isError = true;
 					break;
 				}
@@ -4855,7 +4785,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 					xmlString.append("<status>").append("A").append("<status>");
 					xmlString.append("<aprv_date>").append(mDate3).append("<aprv_date>");
 					xmlString.append("<emp_code__aprv>").append(loginEmpCode).append("<emp_code__aprv>");
-					
+					xmlString.append("<status>").append("A").append("<status>");
 					if((Integer.parseInt(ediOption)) == 2)
 					{
 						System.out.println("Migration done on later...");
@@ -5096,10 +5026,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 					pstmt7.close();
 					pstmt7 = null;
 				}
-				
-				//Added by Sana S on 07/11/19[start]
-				connectionObject.commit();
-				//Added by Sana S on 07/11/19[end]
 
 			}
 			catch (Exception fe)
@@ -5671,7 +5597,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 			System.out.println("db2xmlgen:::::["+db2xmlgen+"] ");
 			String mainDomFileName = db2xmlgen.createXML(objName, objContext, pageContext, qryParam, qryParamType, "", userInfoStr );
 			String fileContent = readFile(mainDomFileName);
-			System.out.println("db2xmlgen:::["+db2xmlgen.toString()+"] nmainDomFileName:::: ["+mainDomFileName+"] \nfileContent:::: ["+fileContent+"]");
+			System.out.println("db2xmlgen:::["+db2xmlgen.toString()+"] \nmainDomFileName:::: ["+mainDomFileName+"] \nfileContent:::: ["+fileContent+"]");
 			mainDom = genericUtility.parseString(fileContent);
 			System.out.println("@@@@@@@@@@@@@MainDom cretaed ......");
 			NodeList detailList1 = mainDom.getElementsByTagName("Detail1");