Skip to content

B
business-java
Commit fdda4393 authored by sanashaikh's avatar sanashaikh
Browse files
Options

Sana S : Added on 07/11/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211508 ce508802-f39f-4f6c-b175-0d175dae99d5
parent aceaee21
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 85 deletions
webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpLeaveConf.java
View file @ fdda4393
package ibase.webitm.ejb.adm.adv; package ibase.webitm.ejb.adm.adv;
import ibase.system.config.AppConnectParm;//Added by Anjali Rawankar on[21/08/2017][For ITMDBACCESS] //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.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ActionHandlerEJB; import ibase.webitm.ejb.ActionHandlerEJB;
...@@ -29,6 +31,7 @@ import java.sql.SQLException; ...@@ -29,6 +31,7 @@ import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -40,33 +43,18 @@ import org.w3c.dom.Node; ...@@ -40,33 +43,18 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
//import org.drools.lang.DRLParser.normal_lhs_block_return; //import org.drools.lang.DRLParser.normal_lhs_block_return;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.bean.sys.ProteusDataSource;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB;//Added by sarita on[20/07/2018][For ITMDBACCESS]
//import ibase.webitm.ejb.ITMDBAccessLocal;//Added by Anjali Rawankar on[21/08/2017][For ITMDBACCESS]
import ibase.webitm.ejb.adm.AdmCommon;
import ibase.webitm.ejb.adm.AttdProcess;
import ibase.webitm.ejb.adm.LeaveEncase;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.hrp.leave.EmpLeaveIC;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.DB2XMLGenerator;
import ibase.webitm.utility.ITMException;
@Stateless @Stateless
public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,EmpLeaveConfRemote public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,EmpLeaveConfRemote
{ {
private UtilMethods utilMethod = null ; public UtilMethods utilMethod = null ;
private AdmCommon admCommon = null; private AdmCommon admCommon = null;
private E12GenericUtility genericUtility = null; private E12GenericUtility genericUtility = null;
private String errXml =""; private String errXml ="";
private String termId = "",loginEmpCode = "",userId = ""; private String termId = "",loginEmpCode = "",userId = "";
private HashMap lveRuleList = null; public HashMap lveRuleList = null;
private ArrayList errList = null; public ArrayList errList = null;
private ArrayList fldList = null; public ArrayList fldList = null;
private String xtraParamsArg = ""; private String xtraParamsArg = "";
private String leaveXmlData = ""; private String leaveXmlData = "";
private ProteusDataSource proteusDataSource = null; private ProteusDataSource proteusDataSource = null;
...@@ -201,7 +189,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -201,7 +189,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
//retString = postLogic(tranId, tranId, 2, xtraParams, conn); commented and added by Varsha V on 24-Jul-18 //retString = postLogic(tranId, tranId, 2, xtraParams, conn); commented and added by Varsha V on 24-Jul-18
retString = postLogic(tranId, tranId, commitFlag, xtraParams, conn); retString = postLogic(tranId, tranId, commitFlag, xtraParams, conn);
System.out.println("retString--["+retString+"]"); System.out.println("retString--["+retString+"]");
System.out.println("return Error List of Post Logic :: "+this.errList); System.out.println("return Error List of Post Logic ::["+this.errList+"]===this.fldList["+this.fldList+"]");
//Modified by Anjali R. on [03/06/2019][Start] //Modified by Anjali R. on [03/06/2019][Start]
if (retString != null && retString.trim().length() > 0) if (retString != null && retString.trim().length() > 0)
{ {
...@@ -225,7 +213,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -225,7 +213,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
for (cnt = 0; cnt < this.errList.size(); cnt++ ) for (cnt = 0; cnt < this.errList.size(); cnt++ )
{ {
errCode = (String)this.errList.get(cnt); errCode = (String)this.errList.get(cnt);
errFldName = (String)this.fldList.get(cnt); if(this.fldList.size() > 0)
{
errFldName = (String)this.fldList.get(cnt);
}
System.out.println("errCode .........."+errCode); System.out.println("errCode .........."+errCode);
/*Modified by Anjali Rawankar on[22/08/2017][Start] /*Modified by Anjali Rawankar on[22/08/2017][Start]
...@@ -249,6 +240,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -249,6 +240,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
this.errList = null; this.errList = null;
this.fldList.clear(); this.fldList.clear();
this.fldList = null; this.fldList = null;
} }
if (errString == null || errString.trim().length() == 0) if (errString == null || errString.trim().length() == 0)
{ {
...@@ -691,7 +683,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -691,7 +683,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(lsEncPrd != null && lsEncPrd.trim().length() > 0) if(lsEncPrd != null && lsEncPrd.trim().length() > 0)
{ {
sql = "select to_date from period where code = ?"; sql = "select to_date from period where code = ?";
...@@ -781,7 +773,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -781,7 +773,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{ {
errCode = "ERROR"; errCode = "ERROR";
}*/ }*/
} }
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
...@@ -833,7 +825,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -833,7 +825,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
*/ */
//Modified by Anjali R. on [03/06/2019][Start] //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(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] //Modified by Anjali R. on [03/06/2019][End]
HashMap retHMap = boEmpleave.getClassVariables(); HashMap retHMap = boEmpleave.getClassVariables();
if( returnValue == -9 ) if( returnValue == -9 )
...@@ -1345,14 +1337,14 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1345,14 +1337,14 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
break; break;
} }
} }
else if(utilMethod.left(lveFrMth , 4).equals("ERR~t")) else if(utilMethod.left(lveFrMth , 4).equals("ERR~t"))
{ {
errCode = utilMethod.mid(lveFrMth , 5); errCode = utilMethod.mid(lveFrMth , 5);
this.errList.add(errCode); this.errList.add(errCode);
this.fldList.add(""); this.fldList.add("");
isError = true; isError = true;
break; break;
} }
lveToMth = admCommon.getAdmEnv(workSite ,cadre ,grade ,"LVE_TOMTH" , mlveDt,connectionObject); lveToMth = admCommon.getAdmEnv(workSite ,cadre ,grade ,"LVE_TOMTH" , mlveDt,connectionObject);
if(lveToMth == null || lveToMth.trim().length() == 0 || lveToMth.indexOf("NULLFOUND") > 0) if(lveToMth == null || lveToMth.trim().length() == 0 || lveToMth.indexOf("NULLFOUND") > 0)
...@@ -1444,7 +1436,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1444,7 +1436,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
noRows = 0; noRows = 0;
sql ="sELECT COUNT(*) AS COUNT FROM EMPLEAVE WHERE EMP_CODE = ? AND LVE_DATE_FR >= ? "+ sql ="sELECT COUNT(*) AS COUNT FROM EMPLEAVE WHERE EMP_CODE = ? AND LVE_DATE_FR >= ? "+
" AND LVE_DATE_TO <= ? AND LVE_CODE = ? AND STATUS = 'A' "+ " AND LVE_DATE_TO <= ? AND LVE_CODE = ? AND STATUS = 'A' "+
" AND USE_FLAG = 'C' AND TRAN_ID <> NVL(?,' ')"; //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 <> ?";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,memp); pstmt.setString(1,memp);
pstmt.setTimestamp(2,lveFrDt); pstmt.setTimestamp(2,lveFrDt);
...@@ -1923,8 +1917,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1923,8 +1917,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
System.out.println("holType---["+holType+"]"); System.out.println("holType---["+holType+"]");
if(holType != null && holType.trim().length() > 0) if(holType != null && holType.trim().length() > 0)
{ {
System.out.println("utilMethod.pos(holType, \"HW\")--["+utilMethod.pos(holType, "HW")+"]"); //Modified by Anjali R. on[25/03/2019][Start]
if(utilMethod.pos(holType, "HW") == 0 ) /*System.out.println("utilMethod.pos(holType, \"HW\")--["+utilMethod.pos(holType, "HW")+"]");
if(utilMethod.pos(holType, "HW") == 0 )*/
System.out.println("utilMethod.pos(holType, \"HW\")--["+utilMethod.pos("HW",holType)+"]");
if(utilMethod.pos ("HW",holType) == 0 )
//Modified by Anjali R. on[25/03/2019][End]
{ {
errCode = holType; errCode = holType;
return errCode; return errCode;
...@@ -2065,7 +2063,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -2065,7 +2063,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
System.out.println("holType--["+holType+"]"); System.out.println("holType--["+holType+"]");
if(holType != null && holType.trim().length() > 0) if(holType != null && holType.trim().length() > 0)
{ {
if(utilMethod.pos(holType , "HW") == 0) //Modified by Anjali R. on[25/03/2019][Start]
//if(utilMethod.pos(holType , "HW") == 0)
if(utilMethod.pos("HW",holType) == 0)
//Modified by Anjali R. on[25/03/2019][End]
{ {
errCode = holType; errCode = holType;
} }
...@@ -3492,7 +3493,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3492,7 +3493,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
double noDays1 = 0,days = 0; double noDays1 = 0,days = 0;
boolean isError = false; boolean isError = false;
java.sql.Timestamp toDate = null,tempDate = null; java.sql.Timestamp toDate = null,tempDate = null;
String sql = ""; String sql = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet resultSet = null; ResultSet resultSet = null;
...@@ -3502,6 +3504,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3502,6 +3504,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
days = noDays; days = noDays;
do do
{ {
sql = "SELECT CODE,FR_DATE,TO_DATE FROM PERIOD WHERE FR_DATE <= ? AND TO_DATE >= ?"; sql = "SELECT CODE,FR_DATE,TO_DATE FROM PERIOD WHERE FR_DATE <= ? AND TO_DATE >= ?";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setTimestamp(1 ,tempDate); pstmt.setTimestamp(1 ,tempDate);
...@@ -3509,10 +3512,13 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3509,10 +3512,13 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
while(resultSet.next()) while(resultSet.next())
{ {
//Modified by Anjali R. on [18/07/2019][Start]
//period = resultSet.getString("");
period = resultSet.getString("CODE"); period = resultSet.getString("CODE");
//Modified by Anjali R. on [18/07/2019][End]
toDate = resultSet.getTimestamp("TO_DATE"); toDate = resultSet.getTimestamp("TO_DATE");
} }
if(resultSet != null) if(resultSet != null)
{ {
resultSet.close(); resultSet.close();
...@@ -3523,6 +3529,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3523,6 +3529,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(toDate.after(lvedtTo)) if(toDate.after(lvedtTo))
{ {
toDate = lvedtTo; toDate = lvedtTo;
...@@ -3546,7 +3554,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3546,7 +3554,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{ {
noDays1 = resultSet.getDouble("NO_DAYS"); noDays1 = resultSet.getDouble("NO_DAYS");
} }
if(resultSet != null) if(resultSet != null)
{ {
resultSet.close(); resultSet.close();
...@@ -3603,6 +3610,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3603,6 +3610,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
catch (Exception fe) catch (Exception fe)
{ {
...@@ -3617,7 +3625,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3617,7 +3625,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
return errCode; return errCode;
} }
private String leavesApprove(String tranId , int saveFlag,String payrollOrVoucher,String payrollPeriod,int commit, Connection connectionObject) throws RemoteException,ITMException public 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 = ""; String museFlag = "",fVal1 = "",fVal2 = "",mStatus = "",mPrd = "",balOpt = "",site = "",period = "";
...@@ -3634,7 +3642,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3634,7 +3642,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
int mCnt = 0 ,times = 0; int mCnt = 0 ,times = 0;
boolean advFlag = false; boolean advFlag = false;
double noDays = 0, days = 0 ,noDays1 = 0; double noDays = 0, days = 0 ,noDays1 = 0;
java.sql.Timestamp lveTempDate1 = null,pmDate1 = null, pmDate2 = null ,effDt1 = null ,effDt2 = null; 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;
String plStart = "", plEnd = "", errCd = "" ,leaveStart = "" , leaveEnd = "", lveStart = "" , lveEnd = ""; String plStart = "", plEnd = "", errCd = "" ,leaveStart = "" , leaveEnd = "", lveStart = "" , lveEnd = "";
String workSite = "", grade = "", cadre = "",lveTblno = "", accum = "", extraArg = ""; String workSite = "", grade = "", cadre = "",lveTblno = "", accum = "", extraArg = "";
java.sql.Timestamp cfDate = null, cfDatelist[] = null; java.sql.Timestamp cfDate = null, cfDatelist[] = null;
...@@ -3642,7 +3651,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3642,7 +3651,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
boolean isError = false; boolean isError = false;
//Modified by Anjali R. on[20/09/2018][Start] //Modified by Anjali R. on[20/09/2018][Start]
java.sql.Timestamp todaysDate = null; Date todaysDate = null;
//Modified by Anjali R. on[20/09/2018][End] //Modified by Anjali R. on[20/09/2018][End]
String detTranId = ""; String detTranId = "";
String sql = "", sql1 = "", sql2 = "", sql3 = "" , sql4 = "", sql5 = "", sql6 = "", sql7 = ""; String sql = "", sql1 = "", sql2 = "", sql3 = "" , sql4 = "", sql5 = "", sql6 = "", sql7 = "";
...@@ -3665,21 +3674,44 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3665,21 +3674,44 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
String lsstarttemp = "B" , lsendtemp = "E"; String lsstarttemp = "B" , lsendtemp = "E";
EmpLeaveIC empLeave = null; EmpLeaveIC empLeave = null;
// Modified by Piyush on 12/01/2018 [To update no of days considering weekly off/holidays as perleave rules. Sun CCF No: IT2016-073 - Request ID: A16ISUN003].End // Modified by Piyush on 12/01/2018 [To update no of days considering weekly off/holidays as perleave rules. Sun CCF No: IT2016-073 - Request ID: A16ISUN003].End
// 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 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(); empLeave = new EmpLeaveIC();
System.out.println("================Inside Leaves approve=============="); System.out.println("================Inside Leaves approve==============");
//connectionObject = getConnection(); //connectionObject = getConnection();
chgTime = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now()); /*chgTime = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now());
mDate3 = utilMethod.dateTime(utilMethod.todaySqlDate()); mDate3 = utilMethod.dateTime(utilMethod.todaySqlDate());*/
errCode = null;
chgTime = utilMethod.dateTime(utilMethod.today(),utilMethod.now());
mDate3 = utilMethod.dateTime(utilMethod.today());
//Modified by Anjali R. on[20/09/2018][To get todays date][Start] //Modified by Anjali R. on[20/09/2018][To get todays date][Start]
todaysDate = new java.sql.Timestamp(System.currentTimeMillis()); todaysDate = new java.sql.Timestamp(System.currentTimeMillis());
//Modified by Anjali R. on[20/09/2018][To get todays date][End] //Modified by Anjali R. on[20/09/2018][To get todays date][End]
mAmt = 0; mAmt = 0;
this.errXml = ""; errXml = "";
cfDate = null; cfDate = null;
do do
{ {
...@@ -3704,7 +3736,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3704,7 +3736,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
lveStart = checkNull(resultSet.getString("LEAVE_STARTS")); lveStart = checkNull(resultSet.getString("LEAVE_STARTS"));
lveEnd = checkNull(resultSet.getString("LEAVE_ENDS")); lveEnd = checkNull(resultSet.getString("LEAVE_ENDS"));
} }
if(resultSet != null) if(resultSet != null)
{ {
resultSet.close(); resultSet.close();
...@@ -3824,8 +3855,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3824,8 +3855,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
break; break;
} }
} }
System.out.println("========errCd=====["+errCd+"]");
noRows = 0; noRows = 0;
if(errCd.trim().length() > 0) if(errCd !=null && errCd.trim().length() > 0)
{ {
errCode = "VTDATE5"; errCode = "VTDATE5";
this.errList.add(errCode); this.errList.add(errCode);
...@@ -3865,12 +3898,13 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -3865,12 +3898,13 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
//Modified by Anjali Rawankar on[20/09/2017][Start] //Modified by Anjali Rawankar on[20/09/2017][Start]
//if(balOpt.equals("Y")) //if(balOpt.equals("Y"))
if("Y".equalsIgnoreCase(balOpt)) if("Y".equalsIgnoreCase(balOpt))
//Modified by Anjali Rawankar on[20/09/2017][End] //Modified by Anjali Rawankar on[20/09/2017][End]
{ {
boolean allowUpdateNegLeave = (Boolean)this.lveRuleList.get("allow_update_negative_leave"); System.out.println("lveRuleList:"+lveRuleList.get("allow_update_negative_leave"));
boolean allowUpdateNegLeave = (boolean) lveRuleList.get("allow_update_negative_leave");
if(allowUpdateNegLeave == true && museFlag.equals("C")); if(allowUpdateNegLeave == true && museFlag.equals("C"));
{ {
errCode = "";
errCode = checkEffectiveBalRecord(tranId,mEmp,mLveCode,mDate1,mDate2 , connectionObject); errCode = checkEffectiveBalRecord(tranId,mEmp,mLveCode,mDate1,mDate2 , connectionObject);
if((errCode != null) && errCode.trim().length() > 0) if((errCode != null) && errCode.trim().length() > 0)
{ {
...@@ -4094,6 +4128,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4094,6 +4128,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true; isError = true;
break; 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 else
{ {
...@@ -4241,6 +4281,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4241,6 +4281,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true; isError = true;
break; 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; noRows = 0;
mCnt = 0; mCnt = 0;
sql = "SELECT COUNT(*) AS COUNT FROM EMPLVE_TRACE WHERE TRAN_ID = ? AND EFF_DATE = ? AND UPTO_DATE = ?"; sql = "SELECT COUNT(*) AS COUNT FROM EMPLVE_TRACE WHERE TRAN_ID = ? AND EFF_DATE = ? AND UPTO_DATE = ?";
...@@ -4327,6 +4373,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4327,6 +4373,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
} }
else else
{ {
System.out.println("Inside ==[4318]");
errCode = "VTEMPLVE4"; errCode = "VTEMPLVE4";
this.errList.add(errCode); this.errList.add(errCode);
this.fldList.add(""); this.fldList.add("");
...@@ -4336,6 +4383,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4336,6 +4383,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
} }
else else
{ {
System.out.println("Inside ==[4328]");
errCode = "VTEMPLVE4"; errCode = "VTEMPLVE4";
this.errList.add(errCode); this.errList.add(errCode);
this.fldList.add(""); this.fldList.add("");
...@@ -4395,7 +4443,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4395,7 +4443,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
/*[Purpose : Used date method of UtilMethod.java] /*[Purpose : Used date method of UtilMethod.java]
*Modified by Anjali Rawankar on [20/09/2017][End] *Modified by Anjali Rawankar on [20/09/2017][End]
*/ */
{ {
noDays = noDays - 0.5; noDays = noDays - 0.5;
} }
...@@ -4425,7 +4472,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4425,7 +4472,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{ {
lsendtemp = "E"; lsendtemp = "E";
} }
lihwdays = Double.parseDouble(empLeave.gbfGetHwDay(mEmp, mDate, tempToDt, mLveCode, lsstarttemp, lsendtemp, mDate1, mDate2, connectionObject)); //lihwdays = Double.parseDouble( empLeave.gbfGetHwDay(mEmp, mDate, tempToDt, mLveCode, lsstarttemp, lsendtemp, mDate1, mDate2, connectionObject));
System.out.println("lihwdays===["+lihwdays+"]"); System.out.println("lihwdays===["+lihwdays+"]");
if(lihwdays < 0) if(lihwdays < 0)
{ {
...@@ -4447,12 +4494,11 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4447,12 +4494,11 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
mDate2 = mDate1; mDate2 = mDate1;
noDays = mDays; noDays = mDays;
} }
noRows = 0; noRows = 0;
System.out.println("tranId: ["+tranId+"]"+"mEmp: ["+mEmp+"] mLveCode: ["+mLveCode+"] noDays: [" System.out.println("tranId: ["+tranId+"]"+"mEmp: ["+mEmp+"] mLveCode: ["+mLveCode+"] noDays: ["
+noDays+"] period: ["+period+"] mDate1: ["+mDate1+"] mDate2: ["+mDate2+"] museFlag: ["+museFlag+"]"); +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 = connectionObject.prepareStatement(sql7);
pstmt7.setString(1, tranId); pstmt7.setString(1, tranId);
pstmt7.setString(2, mEmp); pstmt7.setString(2, mEmp);
...@@ -4482,6 +4528,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4482,6 +4528,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true; isError = true;
break; 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]
if (utilMethod.pos("ELVA" , museFlag) > 0) if (utilMethod.pos("ELVA" , museFlag) > 0)
{ {
break; break;
...@@ -4500,7 +4556,62 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4500,7 +4556,62 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{ {
break; break;
} }
if(museFlag.equals("V")) //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]
if( utilMethod.pos("ELVA" , museFlag) == 0)
{
if (lcLveSumTotdays < mDays)
{
lcLveSumTotdays = mDays - lcLveSumTotdays;
period = "";
sql = "select max(prd_code) as max_period from empleave_summary where tran_id = ? and emp_code = ? and lve_code = ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1, tranId);
pstmt.setString(2, mEmp);
pstmt.setString(3, mLveCode);
resultSet = pstmt.executeQuery();
if(resultSet.next())
{
period = checkNull(resultSet.getString("max_period"));
}
if(resultSet != null)
{
resultSet.close();
resultSet = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(period == null || period.trim().length() == 0)
{
errCode = "DS000";
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
sql = "update empleave_summary set no_days = no_days + ? where tran_id = ? and emp_code = ? and prd_code = ? and lve_code = ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setDouble(1, noDays);
pstmt.setString(2, tranId);
pstmt.setString(3, mEmp);
pstmt.setString(4, period);
pstmt.setString(5, mLveCode);
int cnt = pstmt.executeUpdate();
if(cnt != 1)
{
errCode = "DS000NR";
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
}
}
//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]
if(museFlag.equalsIgnoreCase("V"))
{ {
sql = ""; sql = "";
sql = "SELECT LVE_CODE__CONVERT FROM LEAVES WHERE LVE_CODE = ?"; sql = "SELECT LVE_CODE__CONVERT FROM LEAVES WHERE LVE_CODE = ?";
...@@ -4542,7 +4653,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4542,7 +4653,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
java.sql.Timestamp today = null; java.sql.Timestamp today = null;
today = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.stringToTime("00:00")); 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 >= ? "; 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 = connectionObject.prepareStatement(sql);
pstmt.setString( 1, mEmp); pstmt.setString( 1, mEmp);
...@@ -4571,9 +4681,13 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4571,9 +4681,13 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true; isError = true;
break; break;
} }
else else
{ {
sql = "SELECT EFF_DATE,UPTO_DATE FROM LEAVEBAL WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE <= ? AND UPTO_DATE >= ?"; //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
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString( 1, mEmp); pstmt.setString( 1, mEmp);
pstmt.setString(2, newLve); pstmt.setString(2, newLve);
...@@ -4581,8 +4695,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4581,8 +4695,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.setTimestamp(4, toDate); pstmt.setTimestamp(4, toDate);
while (resultSet.next()) while (resultSet.next())
{ {
effDt1 = resultSet.getTimestamp("EFF_DATE"); /*effDt1 = resultSet.getTimestamp("EFF_DATE");
effDt2 = resultSet.getTimestamp("UPTO_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)+"]");
} }
if(resultSet != null) if(resultSet != null)
{ {
...@@ -4596,16 +4718,27 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4596,16 +4718,27 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
} }
} }
} }
noRows = 0; noRows = 0;
System.out.println("2. mEmp: ["+mEmp+"] newLve: ["+newLve+"] effDt1: ["+effDt1+"] effDt2: ["+effDt2+"]"); System.out.println("2. mEmp: ["+mEmp+"] newLve: ["+newLve+"] effDt1: ["+effDt1+"] effDt2: ["+effDt2+"]");
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 < ?"; //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
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setDouble( 1, mDays); pstmt.setDouble( 1, balDays+mDays);
pstmt.setDouble( 2, mDays); //Added by Sana S on 14/10/19
pstmt.setString(3, mEmp); pstmt.setDouble( 2, ConvDays);
pstmt.setString(4, newLve); //end
pstmt.setTimestamp(3, effDt1); pstmt.setDouble( 3, mDays);
pstmt.setTimestamp(4, effDt2); 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]
noRows = pstmt.executeUpdate(); noRows = pstmt.executeUpdate();
if(pstmt != null) if(pstmt != null)
{ {
...@@ -4615,29 +4748,32 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4615,29 +4748,32 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
if(noRows != 1) if(noRows != 1)
{ {
errCode = "DS000NR"; errCode = "DS000NR";
this.errList.add(errCode); errList.add(errCode);
this.fldList.add("");; fldList.add("");;
isError = true; isError = true;
break; break;
} }
} }
if(saveFlag == 2) if(saveFlag == 2)
{ {
noRows = 0; noRows = 0;
sql = "UPDATE EMPLEAVE SET STATUS = 'A', ENCH_AMT = ?,STATUS_DATE = ?,EMP_CODE__APRV = ?,TRAN_ID__PAYR = ?,APRV_DATE = ? WHERE TRAN_ID = ?"; 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 = connectionObject.prepareStatement(sql);
pstmt.setDouble(1, mAmt); pstmt.setDouble(1, mAmt);
//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][Start] //Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][Start]
//pstmt.setTimestamp(2, mDate3); //pstmt.setTimestamp(2, mDate3);
pstmt.setTimestamp(2, todaysDate); //Modifeid by Sana S on 14/10/19
//pstmt.setTimestamp(2, todaysDate);
pstmt.setString(2, sdf.format(todaysDate));
//end
//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][End] //Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][End]
pstmt.setString(3,this.loginEmpCode); pstmt.setString(3,loginEmpCode);
pstmt.setString(4,null); pstmt.setString(4,null);
//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start] //Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
//pstmt.setTimestamp(5,chgTime); //pstmt.setTimestamp(5,chgTime);
pstmt.setTimestamp(5,todaysDate); //pstmt.setTimestamp(5, todaysDate);
pstmt.setString(5, sdf.format(todaysDate));
//end
//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start] //Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
pstmt.setString(6, tranId); pstmt.setString(6, tranId);
noRows = pstmt.executeUpdate(); noRows = pstmt.executeUpdate();
...@@ -4664,8 +4800,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4664,8 +4800,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
if(noRows != 1) if(noRows != 1)
{ {
errCode = "DS000NR"; errCode = "DS000NR";
this.errList.add(errCode); errList.add(errCode);
this.fldList.add(""); fldList.add("");
isError = true; isError = true;
break; break;
} }
...@@ -4719,7 +4855,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4719,7 +4855,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
xmlString.append("<status>").append("A").append("<status>"); xmlString.append("<status>").append("A").append("<status>");
xmlString.append("<aprv_date>").append(mDate3).append("<aprv_date>"); xmlString.append("<aprv_date>").append(mDate3).append("<aprv_date>");
xmlString.append("<emp_code__aprv>").append(loginEmpCode).append("<emp_code__aprv>"); xmlString.append("<emp_code__aprv>").append(loginEmpCode).append("<emp_code__aprv>");
xmlString.append("<status>").append("A").append("<status>");
if((Integer.parseInt(ediOption)) == 2) if((Integer.parseInt(ediOption)) == 2)
{ {
System.out.println("Migration done on later..."); System.out.println("Migration done on later...");
...@@ -4868,7 +5004,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4868,7 +5004,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
End if End if
End If*/ End If*/
// end edi // end edi
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -4960,12 +5096,17 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -4960,12 +5096,17 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt7.close(); pstmt7.close();
pstmt7 = null; 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) catch (Exception fe)
{ {
fe.printStackTrace(); fe.printStackTrace();
} }
} }
return errCode; return errCode;
...@@ -5048,7 +5189,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5048,7 +5189,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
cadre = resultSet.getString("CADRE"); cadre = resultSet.getString("CADRE");
grade = resultSet.getString("GRADE"); grade = resultSet.getString("GRADE");
} }
if(resultSet != null) if(resultSet != null)
{ {
resultSet.close(); resultSet.close();
...@@ -5261,12 +5401,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5261,12 +5401,12 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
availFrom = dateJoin; availFrom = dateJoin;
process = "Y"; process = "Y";
} }
else else
{ {
availFrom = dateJoin; availFrom = dateJoin;
process = "Y"; process = "Y";
} }
if (availAterMonths == 0) if (availAterMonths == 0)
{ {
availAterMonths = 0; availAterMonths = 0;
...@@ -5306,13 +5446,14 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5306,13 +5446,14 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
lveFrDt1 = utilMethod.dateTime(lveFrDate1); lveFrDt1 = utilMethod.dateTime(lveFrDate1);
lveToDt1 = utilMethod.dateTime(lveToDate1); lveToDt1 = utilMethod.dateTime(lveToDate1);
// Modified by Piyush on 02/02/2019 [To restrict expiry date till '2034' because of no of months can be more then this].Start // Modified by Anjali R on 02/02/2019 [To restrict expiry date till '2034' because of no of months can be more then this].Start
int litempyear = 0; int litempyear = 0;
litempyear = utilMethod.year(utilMethod.date(lveToDt1)); litempyear = utilMethod.year(utilMethod.date(lveToDt1));
if (litempyear < 100) if (litempyear < 100)
...@@ -5324,7 +5465,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5324,7 +5465,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{ {
accumulateMonths = 24408 - litempyear; accumulateMonths = 24408 - litempyear;
} }
// Modified by Piyush on 02/02/2019 [To restrict expiry date till '2036' because of no of months can be more then this].End // Modified by Anjali R on 02/02/2019 [To restrict expiry date till '2036' because of no of months can be more then this].End
if("Y".equalsIgnoreCase(accumulate)) if("Y".equalsIgnoreCase(accumulate))
{ {
...@@ -5337,6 +5478,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5337,6 +5478,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
expDate = lveToDt1; expDate = lveToDt1;
} }
} }
if(lveFrDate1.before(newEffDate)) if(lveFrDate1.before(newEffDate))
{ {
effDate = newEffDate; effDate = newEffDate;
...@@ -5383,10 +5526,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5383,10 +5526,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
break; break;
} }
noRows = 0; noRows = 0;
//Modified by Anjali R. on[18/07/2019][Start]
/*sql = "INSERT INTO LEAVEBAL"+
"(EMP_CODE,LVE_CODE,EFF_DATE,UPTO_DATE,EXP_DATE,EDIT_FLAG,AVAIL_DAYS, CONS_DAYS,"+
"ENCH_DAYS,BAL_DAYS,PREV_BAL,ENCASHABLE,ACCT_PRD,CHG_DATE,CHG_USER,CHG_TERM,CONV_DAYS)"+
"VALUES(?,?,?,?,?,'A',0,0,0,0,0,?,?,SYSDATE,?,?,0)";*/
sql = "INSERT INTO LEAVEBAL"+ sql = "INSERT INTO LEAVEBAL"+
"(EMP_CODE,LVE_CODE,EFF_DATE,UPTO_DATE,EXP_DATE,EDIT_FLAG,AVAIL_DAYS, CONS_DAYS,"+ "(EMP_CODE,LVE_CODE,EFF_DATE,UPTO_DATE,EXP_DATE,EDIT_FLAG,AVAIL_DAYS, CONS_DAYS,"+
"ENCH_DAYS,BAL_DAYS,PREV_BAL,ENCASHABLE,ACCT_PRD,CHG_DATE,CHG_USER,CHG_TERM,CONV_DAYS)"+ "ENCH_DAYS,BAL_DAYS,PREV_BAL,ENCASHABLE,ACCT_PRD,CHG_DATE,CHG_USER,CHG_TERM,CONV_DAYS)"+
"VALUES(?,?,?,?,?,'P',0,0,0,0,0,?,?,SYSDATE,?,?,0)"; "VALUES(?,?,?,?,?,'P',0,0,0,0,0,?,?,SYSDATE,?,?,0)";
//Modified by Anjali R. on[18/07/2019][End]
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
pstmt.setString(2,lveCode); pstmt.setString(2,lveCode);
...@@ -5522,7 +5671,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -5522,7 +5671,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
System.out.println("db2xmlgen:::::["+db2xmlgen+"] "); System.out.println("db2xmlgen:::::["+db2xmlgen+"] ");
String mainDomFileName = db2xmlgen.createXML(objName, objContext, pageContext, qryParam, qryParamType, "", userInfoStr ); String mainDomFileName = db2xmlgen.createXML(objName, objContext, pageContext, qryParam, qryParamType, "", userInfoStr );
String fileContent = readFile(mainDomFileName); 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); mainDom = genericUtility.parseString(fileContent);
System.out.println("@@@@@@@@@@@@@MainDom cretaed ......"); System.out.println("@@@@@@@@@@@@@MainDom cretaed ......");
NodeList detailList1 = mainDom.getElementsByTagName("Detail1"); NodeList detailList1 = mainDom.getElementsByTagName("Detail1");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment