Commit 87abacf7 authored by rtelang's avatar rtelang

EmpLeaveCancel.java

- Changes done related to cancel button of Period Wise Leave and Employee Wise Leave.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205458 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f29e57be
...@@ -507,7 +507,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -507,7 +507,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
while(resultSet.next()) //Modified by Rohini T on [16/08/19][Start]
//while(resultSet.next())
if(resultSet.next())
//Modified by Rohini T on [16/08/19][Start]
{ {
noRows++; noRows++;
empCode = checkNull(resultSet.getString("EMP_CODE")); empCode = checkNull(resultSet.getString("EMP_CODE"));
...@@ -536,6 +539,8 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -536,6 +539,8 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
errCode = "VTEMPLVE13"; errCode = "VTEMPLVE13";
break; break;
} }
//Modified by Rohini T on 16/08/19[Start]
/*
noRows = 0; noRows = 0;
sql1 = "SELECT EFF_DATE , UPTO_DATE , LVES_ALLOC FROM EMPLVE_TRACE WHERE TRAN_ID = ? ORDER BY EFF_DATE "; sql1 = "SELECT EFF_DATE , UPTO_DATE , LVES_ALLOC FROM EMPLVE_TRACE WHERE TRAN_ID = ? ORDER BY EFF_DATE ";
pstmt1 = connectionObject.prepareStatement(sql1); pstmt1 = connectionObject.prepareStatement(sql1);
...@@ -599,7 +604,65 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -599,7 +604,65 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt2 = null; pstmt2 = null;
} }
}*/
sql1 = "SELECT EFF_DATE , UPTO_DATE , LVES_ALLOC FROM EMPLVE_TRACE WHERE TRAN_ID = ? ORDER BY EFF_DATE ";
pstmt1 = connectionObject.prepareStatement(sql1);
pstmt1.setString(1, tranId);
resultSet1 = pstmt1.executeQuery();
while(resultSet1.next())
{
val3 = resultSet1.getTimestamp("EFF_DATE");
val4 = resultSet1.getTimestamp("UPTO_DATE");
val5 = resultSet1.getDouble("LVES_ALLOC");
if(cfDate == null)
{
cfDate = lveDateFr;
}
if(val3.before(cfDate))
{
cfDate = val3;
}
sql2 = "";
if("E".equalsIgnoreCase(useFlag))
{
sql2 = "UPDATE LEAVEBAL SET BAL_DAYS = BAL_DAYS + ?,ENCH_DAYS = ENCH_DAYS -? WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE = ? AND UPTO_DATE <= ?";
}
else
{
sql2 = "UPDATE LEAVEBAL SET BAL_DAYS = BAL_DAYS + ?,CONS_DAYS = CONS_DAYS -? WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE = ? AND UPTO_DATE <= ?";
}
pstmt2 = connectionObject.prepareStatement(sql2);
pstmt2.setDouble(1, val5);
pstmt2.setDouble(2, val5);
pstmt2.setString(3, empCode);
pstmt2.setString(4, lveCode);
pstmt2.setTimestamp(5, val3);
pstmt2.setTimestamp(6, val4);
noRows = pstmt2.executeUpdate();
System.out.println("noRows updated in leavebal::["+noRows+"]");
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
sql1 = "";
sql1 = "DELETE FROM EMPLVE_TRACE WHERE TRAN_ID = ? AND EFF_DATE = ? AND UPTO_DATE = ?";
pstmt2 = connectionObject.prepareStatement(sql1);
pstmt2.setString(1, tranId);
pstmt2.setTimestamp(2, val3);
pstmt2.setTimestamp(3, val4);
noRows = pstmt2.executeUpdate();
System.out.println("noRows deleted from emplve_trace::["+noRows+"]");
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
} }
//Modified by Rohini T on 16/08/19[End]
//Modified by Anjali R. on [07/01/2019][Start] //Modified by Anjali R. on [07/01/2019][Start]
//if(errCode.trim().length() != 0) //if(errCode.trim().length() != 0)
if(errCode != null && errCode.trim().length() > 0) if(errCode != null && errCode.trim().length() > 0)
...@@ -1135,7 +1198,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1135,7 +1198,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
//Modified by Anjali R. on [18/07/2019][Start] //Modified by Anjali R. on [18/07/2019][Start]
//if(status.equals("A")) //if(status.equals("A"))
if(status.equalsIgnoreCase("A")) if(status.equalsIgnoreCase("A"))
//Modified by Anjali R. on [18/07/2019][End] //Modified by Anjali R. on [18/07/2019][End]
{ {
hmap = cancelLve(tranId , 2 , connectionObject); hmap = cancelLve(tranId , 2 , connectionObject);
if(errCode != null && errCode.trim().length() > 0 &&utilMethod.pos(errCode , "<Errors>") > 0) if(errCode != null && errCode.trim().length() > 0 &&utilMethod.pos(errCode , "<Errors>") > 0)
...@@ -1193,8 +1256,27 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1193,8 +1256,27 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
} }
}*/ }*/
//Modified by Anjali R.on [03/06/2019][End] //Modified by Anjali R.on [03/06/2019][End]
}
else if(status.equals("R"))
{
System.out.println("Inside status(R)");
statusDate = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now());
sql = "";
noRows = 0;
sql = "update empleave set status = 'C' , status_date = ? where tran_id = ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setTimestamp(1,statusDate);
pstmt.setString(2, tranId);
noRows = pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
} }
} }
}
//Modified by Rohini T on [19/08/19][Start]
/*
else if(status.equals("R")) else if(status.equals("R"))
{ {
statusDate = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now()); statusDate = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now());
...@@ -1210,7 +1292,9 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1210,7 +1292,9 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} System.out.println("Number of rows updated in empleave "+noRows);
}*/
//Modified by Rohini T on [19/08/19][End]
break; break;
}while(true); }while(true);
if(errCode != null && errCode.trim().length() > 0 ) if(errCode != null && errCode.trim().length() > 0 )
......
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