Skip to content

B
business-java
Commit f7fe8867 authored by arawankar's avatar arawankar
Browse files
Options

Changes made in EmpLeaveCancel.java 

1.Changes made to cancel the approve and unapproved leave

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@186082 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cbb4317d
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 7 deletions
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveCancel.java
View file @ f7fe8867
......@@ -681,9 +681,9 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
String empCodeAprv = "",lveType = "",prdCode = "",remarks = "",tranIdPayr="",
authEmp = "",applDate = "",authEmpAlternate = "",chgdate = "",chguser = "",chgterm = "",
leaveStarts = "",leaveEnds = "",aprvDate1= "";
java.sql.Timestamp statusDate1 = null,lvefrdate1 = null,lvetodate1 = null;
authEmp = "",authEmpAlternate = "",chgdate = "",chguser = "",chgterm = "",
leaveStarts = "",leaveEnds = "";
java.sql.Timestamp statusDate1 = null,lvefrdate1 = null,lvetodate1 = null,aprvDate1= null,applDate = null;
//String startTime = "",endTime = "",aprvDate = "";
java.sql.Timestamp startTime = null,endTime = null,aprvDate = null,chgDate = null;
double enchAmt = 0,noDays = 0,noDaysAdv = 0;
......@@ -711,7 +711,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
//Modified by Anjali R. on [04/06/2018][To take LVE_DATE_FR,LVE_DATE_TO in timestamp data type][End]
lveCode = checkNull(rs1.getString("LVE_CODE"));
empCodeAprv = checkNull(rs1.getString("EMP_CODE__APRV"));
aprvDate1 = checkNull(rs1.getString("APRV_DATE"));
//Modified by Anjali R. on [06/06/2018][To get apprv date in timestamp data type][Start]
//aprvDate1 = checkNull(rs1.getString("APRV_DATE"));
aprvDate1 = rs1.getTimestamp("APRV_DATE");
//Modified by Anjali R. on [06/06/2018][To get apprv date in timestamp data type][End]
lveType = checkNull(rs1.getString("LVE_TYPE"));
useFlag = checkNull(rs1.getString("USE_FLAG"));
enchAmt = rs1.getDouble("ENCH_AMT");
......@@ -727,7 +730,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
remarks = checkNull(rs1.getString("REMARKS"));
tranIdPayr = checkNull(rs1.getString("TRAN_ID__PAYR"));
noDaysAdv = rs1.getDouble("NO_DAYS_ADV");
applDate = checkNull(rs1.getString("APPL_DATE"));
//Modified by Anjali R. on[06/06/2018][To get appl date in timestamp data type][Start]
applDate = rs1.getTimestamp("APPL_DATE");
//applDate = checkNull(rs1.getString("APPL_DATE"));
//Modified by Anjali R. on[06/06/2018][To get appl date in timestamp data type][End]
authEmp = checkNull(rs1.getString("AUTH_EMP"));
authEmpAlternate = checkNull(rs1.getString("AUTH_EMP_ALTERNATE"));
leaveStarts = checkNull(rs1.getString("LEAVE_STARTS"));
......@@ -772,7 +778,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
ps2.setString(5, lveCode);
ps2.setString(6, empCodeAprv);
ps2.setString(7,aprvDate1.length() > 0?genericUtility.getValidDateString(aprvDate1, genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()):null);
//Modified by Anjali R. on[06/06/2018][To set aprv date in timestamp data type][Start]
//ps2.setString(7,aprvDate1.length() > 0?genericUtility.getValidDateString(aprvDate1, genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()):null);
ps2.setTimestamp(7,aprvDate1);
//Modified by Anjali R. on[06/06/2018][To set aprv date in timestamp data type][End]
ps2.setString(8, lveType);
ps2.setString(9, useFlag);
ps2.setDouble(10, enchAmt);
......@@ -788,7 +797,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
ps2.setString(15, remarks);
ps2.setString(16, tranIdPayr);
ps2.setDouble(17, noDaysAdv);
ps2.setString(18, applDate.length() > 0?genericUtility.getValidDateString(applDate, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat()):null);
//Modified by Anjali R. on[06/06/2018][To set appl date in timestamp data type][Start]
//ps2.setString(18, applDate.length() > 0?genericUtility.getValidDateString(applDate, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat()):null);
ps2.setTimestamp(18, applDate);
//Modified by Anjali R. on[06/06/2018][To set appl date in timestamp data type][End]
ps2.setString(19, authEmp);
ps2.setString(20, authEmpAlternate);
ps2.setTimestamp(21, chgDate);
......
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