Commit c266a2e6 authored by arawankar's avatar arawankar

-Changes made in below component

EmpLeaveConf.java
- Added updated method of leaveRule2

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189557 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e0f5f250
...@@ -1029,7 +1029,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1029,7 +1029,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][Start]
//This will not check on confirmation //This will not check on confirmation
/*if (noRows == 0 || balDays <= 0) /*if (noRows == 0 || balDays <= 0)
{ {
...@@ -1054,7 +1053,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1054,7 +1053,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
} }
}*/ }*/
//This will not check on confirmation //This will not check on confirmation
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][End]
} }
} }
break; break;
...@@ -1087,7 +1086,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1087,7 +1086,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][Start]
//This will not check on confirmation //This will not check on confirmation
/*if (noRows == 0 || balDays <= 0) /*if (noRows == 0 || balDays <= 0)
{ {
...@@ -1113,7 +1111,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1113,7 +1111,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
}*/ }*/
//This will not check on confirmation //This will not check on confirmation
//break; //break;
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][End]
} }
else if ("C".equals(museFlag)) else if ("C".equals(museFlag))
{ {
...@@ -1381,11 +1378,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -1381,11 +1378,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true; isError = true;
break; break;
} }
//Modified by Anjali R. on [20/08/2018][Check equal ignore case while comparing two strings][Start]
//if(payable.equals("Y")) //if(payable.equals("Y"))
System.out.println("payable--["+payable+"]"); System.out.println("payable--["+payable+"]");
if("Y".equalsIgnoreCase(payable)) if("Y".equalsIgnoreCase(payable))
//Modified by Anjali R. on [20/08/2018][Check equal ignore case while comparing two strings][End]
{ {
errCode = ""; errCode = "";
System.out.println("nvoNo--["+nvoNo+"]"); System.out.println("nvoNo--["+nvoNo+"]");
...@@ -2092,7 +2087,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal, ...@@ -2092,7 +2087,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
} }
//Added by Anjali R. on [20/AUG/2018][Added updated leaveRules2 method][End] //Added by Anjali R. on [20/AUG/2018][Added updated leaveRules2 method][End]
//Modfied by Anjali R. on [20/08/2018][Mthod name change leavesRule2 to leaveRules2_old .this method has old implementation]
private String leaveRules2_old (String empCode, String lveCode, java.sql.Timestamp lvedt, java.sql.Timestamp lvedtTo, Connection conn) throws RemoteException,ITMException private String leaveRules2_old (String empCode, String lveCode, java.sql.Timestamp lvedt, java.sql.Timestamp lvedtTo, Connection conn) throws RemoteException,ITMException
{ {
......
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