Commit 0fc537f5 authored by arawankar's avatar arawankar

EmpLeaveCancel.java

-Rollback and commit related change done in this component
LveEncArrCanc.java
-Rollback and commit related change done in this component,as well as return string related changes done.(now component will return errstring rather errcode)

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190948 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 234579d4
// Date: 15/09/2018
/*
1. Changes need in post logic
2. Provision of site wise Parameter for "ALLOW_CANCEL_LVEENC"
3.
*/
package ibase.webitm.ejb.adm.adv; package ibase.webitm.ejb.adm.adv;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
...@@ -23,6 +30,8 @@ import java.sql.Timestamp; ...@@ -23,6 +30,8 @@ import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.*;
import org.w3c.dom.*;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.naming.InitialContext; import javax.naming.InitialContext;
...@@ -54,22 +63,90 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -54,22 +63,90 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
String retString = ""; String retString = "";
Connection conn = null; Connection conn = null;
// Modified by Piyush on 15/09/2018.Start
Boolean isError = false;
String sqlStr = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
int cnt = 0;
// Modified by Piyush on 15/09/2018.End
//Modified by Anjali R. on [18/09/2018][Start]
ITMDBAccessEJB itmDBAccess = null;
//Modified by Anjali R. on [18/09/2018][End]
try try
{ {
conn = getConnection(); conn = getConnection();
//Modified by Anjali R. on [18/09/2018][Start]
itmDBAccess = new ITMDBAccessEJB();
//Modified by Anjali R. on [18/09/2018][End]
//Modified by Anjali R. on [07/08/2018][Start] //Modified by Anjali R. on [07/08/2018][Start]
ExtraParams = xtraParams; ExtraParams = xtraParams;
forceFlag = forcedFlag; forceFlag = forcedFlag;
//Modified by Anjali R. on [07/08/2018][End] //Modified by Anjali R. on [07/08/2018][End]
retString = confirm( tranId, xtraParams, forcedFlag, conn); retString = confirm( tranId, xtraParams, forcedFlag, conn);
System.out.println("retString-from confirm method--["+retString+"]");
//Modified by Anjali R. on [18/09/2018][If confirm method return string,then show success message][Start]
if(retString == null || retString.trim().length() == 0)
{
retString = "VTLVECAR01";//Transaction Cancelled!
isError = false;
conn.commit();
}
else
{
conn.rollback();
isError = true;
return retString;
}
//Modified by Anjali R. on [18/09/2018][If confirm method return string,then show success message][End]
// Modified by Piyush on 15/09/2018.Start
sqlStr = "SELECT COUNT(1) AS CNT FROM EMPLEAVE WHERE TRAN_ID = ? AND STATUS = 'C'";
pstmt = conn.prepareStatement(sqlStr);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt("CNT");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt == 0)
{
isError = true;
//Modified by Anjali R. on [18/09/2018][In case of leave not cancelled][Start]
retString = itmDBAccess.getErrorString("", "VTLVECAN01", "", "", conn);
return retString;
//Modified by Anjali R. on [18/09/2018][In case of leave not cancelled][End]
}
else
{
retString = itmDBAccess.getErrorString("", retString, "", "", conn);
}
// Modified by Piyush on 15/09/2018.End
} }
catch(Exception e) catch(Exception e)
{ {
System.out.println("Exception :EmpLeaveCancel :confirm():" + e.getMessage() + ":"); System.out.println("Exception :EmpLeaveCancel :confirm():" + e.getMessage() + ":");
retString = genericUtility.createErrorString(e); retString = genericUtility.createErrorString(e);
e.printStackTrace(); e.printStackTrace();
// Modified by Piyush on 15/09/2018.Start
isError = true;
throw new ITMException(e); throw new ITMException(e);
// Modified by Piyush on 15/09/2018.End
} }
finally finally
{ {
...@@ -77,6 +154,26 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -77,6 +154,26 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
if(conn != null) if(conn != null)
{ {
// Modified by Piyush on 15/09/2018.Start
if (isError)
{
conn.rollback();
}
else
{
conn.commit();
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
// Modified by Piyush on 15/09/2018.End
conn.close(); conn.close();
conn = null; conn = null;
} }
...@@ -175,11 +272,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -175,11 +272,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
} }
if (errString == null || errString.trim().length() == 0) if (errString == null || errString.trim().length() == 0)
{ {
conn.commit(); //Modified by Anjali R. on [18/09/2018][Connection commit will not be happen here][Start]
//conn.commit();
//Modified by Anjali R. on [18/09/2018][Connection commit will not be happen here][End]
//Modified by Anjali R. on [18/09/2018][In case of success ,this method will return empty string][Start]
//Added and commented by sarita on to call getErrorString connection method on 20 JULY 2018 [START] //Added and commented by sarita on to call getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString( "", "VTLVECAR01" , this.userId ); //errString = itmDBAccess.getErrorString( "", "VTLVECAR01" , this.userId );
errString = itmDBAccess.getErrorString("","VTLVECAR01",this.userId,"",conn); //errString = itmDBAccess.getErrorString("","VTLVECAR01",this.userId,"",conn);
errString = "";
//Added and commented by sarita on to call getErrorString connection method on 20 JULY 2018 [END] //Added and commented by sarita on to call getErrorString connection method on 20 JULY 2018 [END]
//Modified by Anjali R. on [18/09/2018][In case of success ,this method will return empty string][End]
} }
else else
{ {
...@@ -191,7 +294,18 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -191,7 +294,18 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
System.out.println("Exception :EmpLeaveCancel :confirm():" + e.getMessage() + ":"); System.out.println("Exception :EmpLeaveCancel :confirm():" + e.getMessage() + ":");
retString = genericUtility.createErrorString(e); retString = genericUtility.createErrorString(e);
e.printStackTrace(); e.printStackTrace();
//Modified by Anjali R. on[18/09/2018][Start]
try
{
conn.rollback();
}catch(Exception e1)
{
System.out.println("Exception :EmpLeaveCancel :confirm():" + e1.getMessage() + ":");
}
//Modified by Anjali R. on[18/09/2018][End]
// Modified by Piyush on 15/09/2018
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
{ {
...@@ -210,7 +324,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -210,7 +324,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
System.out.println("Error String Returned from Cancellation of leave :: [" + errString + "]"); System.out.println("Error String Returned from Cancellation of leave :: [" + errString + "]");
return errString; return errString;
} }
private String postLogic (String tranidFr,String tranidTo,int commit,String xtraParms,Connection conn) private String postLogic (String tranidFr,String tranidTo,int commit,String xtraParms,Connection conn) throws ITMException
{ {
HashMap errCode = new HashMap(); HashMap errCode = new HashMap();
String tranId = "" ,useFlag = "",tranidTrimmed = "",status = "",errCode1 = ""; String tranId = "" ,useFlag = "",tranidTrimmed = "",status = "",errCode1 = "";
...@@ -284,8 +398,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -284,8 +398,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt.setString(2,tranidTrimmed); pstmt.setString(2,tranidTrimmed);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
if(count == 0) //Modified by Anjali R. on[18/09/2018][To update wf_prc_status ][Start]
{ //if(count == 0)
//{
//Modified by Anjali R. on[18/09/2018][To update wf_prc_status ][End]
count = 0; count = 0;
sql = ""; sql = "";
sql = "update wf_prc_status set process_status = 9 , status_remarks = 'Leave application is canceled from ERP'" + sql = "update wf_prc_status set process_status = 9 , status_remarks = 'Leave application is canceled from ERP'" +
...@@ -307,38 +423,57 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -307,38 +423,57 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
errCode1 = "DS000"; errCode1 = "DS000";
} }
} //Modified by Anjali R. on[18/09/2018][To update wf_prc_status ][Start]
/*}
else else
{ {
errCode1 = "DS000"; errCode1 = "DS000";
} }*/
//Modified by Anjali R. on[18/09/2018][To update wf_prc_status ][End]
System.out.println("errCode1---["+errCode1+"]");
if(errCode1.trim().length() > 0) if(errCode1.trim().length() > 0)
{ {
conn.rollback(); conn.rollback();
} }
else //Modified by Anjali R. on [18/09/2018][Connection will not be commit in this method][Start]
/*else
{ {
conn.commit(); conn.commit();
}*/
//Modified by Anjali R. on [18/09/2018][Connection will not be commit in this method][End]
} }
} }
} //}
} }
if(errCode.size() > 0) if(errCode.size() > 0)
{ {
conn.rollback(); //conn.rollback();
} }
else else
{ {
errCode1 = "VTLVCANC01"; /*errCode1 = "VTLVCANC01";
errList.add(errCode1); errList.add(errCode1);
fldList.add(""); fldList.add("");*/
conn.commit(); //Modified by Anjali R. on [18/09/2018][Connection will not be commit in this method][Start]
//conn.commit();
//Modified by Anjali R. on [18/09/2018][Connection will not be commit in this method][End]
} }
} }
catch(Exception e) catch(Exception e)
{ {
//Modified by Anjali R. on [19/09/2018][Start]
e.printStackTrace(); e.printStackTrace();
try
{
conn.rollback();
}
catch (Exception e1)
{
e1.printStackTrace();
}
//Modified by Anjali R. on [19/09/2018][End]
// Modified by Piyush on 15/09/2018
throw new ITMException(e);
} }
return errCode1; return errCode1;
} }
...@@ -421,7 +556,16 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -421,7 +556,16 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
cfDate = val3; cfDate = val3;
} }
sql2 = ""; sql2 = "";
//Modified by Anjali R. on [19/09/2018][Query to update ench days in case of encashment][Start]
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
{
//Modified by Anjali R. on [19/09/2018][Query to update ench days in case of encashment][End]
sql2 = "UPDATE LEAVEBAL SET BAL_DAYS = BAL_DAYS + ?,CONS_DAYS = CONS_DAYS -? WHERE EMP_CODE = ? AND LVE_CODE = ? AND EFF_DATE = ? AND UPTO_DATE <= ?"; 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 = connectionObject.prepareStatement(sql2);
pstmt2.setDouble(1, val5); pstmt2.setDouble(1, val5);
pstmt2.setDouble(2, val5); pstmt2.setDouble(2, val5);
...@@ -503,12 +647,15 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -503,12 +647,15 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
if(errCode != null && errCode.trim().length() != 0) if(errCode != null && errCode.trim().length() != 0)
{ {
this.errList.add(errCode); this.errList.add(errCode);
this.fldList.add(""); this.fldList.add("");
if(commit == 2) //Commented by Anjali R. on[19/09/2018][Start]
/*if(commit == 2)
{ {
connectionObject.rollback(); connectionObject.rollback();
} }*/
//Commented by Anjali R. on[19/09/2018][End]
} }
else else
{ {
...@@ -532,12 +679,13 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -532,12 +679,13 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
this.errXml = errCode; this.errXml = errCode;
this.errList.add(errCode); this.errList.add(errCode);
this.fldList.add(""); this.fldList.add("");
connectionObject.rollback(); //connectionObject.rollback();//Commented by Anjali R. on[19/09/2018]
} }
else else
{ {
this.errXml = ""; this.errXml = "";
connectionObject.commit(); //Modified by Anjali R. on [18/09/2018][Commit will not happen here]
//connectionObject.commit();
/*if(status.equals("A")) /*if(status.equals("A"))
{ {
...@@ -590,6 +738,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -590,6 +738,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
//Modified by Anjali R. on[19/09/2018][Start]
try
{
connectionObject.rollback();
}
catch(Exception e1)
{
System.out.println("Exception in empleave cancel component--["+e1.getMessage()+"]");
throw new ITMException(e1);
}
//Modified by Anjali R. on[19/09/2018][End]
throw new ITMException(e); throw new ITMException(e);
} }
//buildErrxml(); //buildErrxml();
...@@ -662,6 +821,46 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -662,6 +821,46 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
if(status.equals("A")) if(status.equals("A"))
{ {
// Modified by Piyush on 15/09/2018.Start
String siteCode = "" , cadreCode = "" , gradeCode = "";
sql = "SELECT PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,empCode);
resultSet = pstmt.executeQuery();
while(resultSet.next())
{
siteCode = checkNull(resultSet.getString("PAY_SITE"));
cadreCode = checkNull(resultSet.getString("CADRE"));
gradeCode = checkNull(resultSet.getString("GRADE"));
}
if(resultSet != null)
{
resultSet.close();
resultSet = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String currDateStr = sdf.format(new Date());
Timestamp currDateTime = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(currDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
String allowEnvLveCancel = checkNull(admCommon.getAdmEnv(siteCode, cadreCode,gradeCode , "ALLOW_CANCEL_LVEENC", currDateTime, connectionObject));
if("NULLFOUND".equalsIgnoreCase(allowEnvLveCancel))
{
allowEnvLveCancel = checkNull(admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", connectionObject));
}
if(!("Y".equalsIgnoreCase(allowEnvLveCancel )))
{
errCode = "VTEMPLVE21";
this.errList.add(errCode);
this.fldList.add("");
break;
}
// Modified by Piyush on 15/09/2018.End
//Modified by Anjali R. on [03/08/2018][To cancel approved leave encashment entries][Start] //Modified by Anjali R. on [03/08/2018][To cancel approved leave encashment entries][Start]
/*errCode = "VTEMPLVE21"; /*errCode = "VTEMPLVE21";
this.errList.add(errCode); this.errList.add(errCode);
...@@ -670,15 +869,49 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -670,15 +869,49 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
//cancellation of approved leaves in case of encashment //cancellation of approved leaves in case of encashment
errCode = cancelEnchLeaves(tranId,connectionObject); errCode = cancelEnchLeaves(tranId,connectionObject);
System.out.println("errCode--["+errCode+"]"); System.out.println("errCode--["+errCode+"]");
//Modified by Anjali R. on[19/09/2018][Start]
if(errCode != null && errCode.trim().length() > 0) /*if(errCode != null && errCode.trim().length() > 0)
{ {
errCode = errCode; errCode = errCode;
System.out.println("errCode---["+errCode+"]"); System.out.println("errCode---["+errCode+"]");
this.errList.add(errCode); this.errList.add(errCode);
this.fldList.add(""); this.fldList.add("");
break; break;
} }*/
if ((errCode != null) && (errCode.trim().length() > 0) && (errCode.indexOf("<Errors>") != -1))
{
try
{
System.out.println("Inside try");
Document errDom = genericUtility.parseString(errCode);
System.out.println("errDom--[" + errDom + "]");
NodeList parentNodeList = errDom.getElementsByTagName("error");
System.out.println("parentNodeList----[" + parentNodeList.getLength() + "]");
Node parentNode = null;
int parentNodeListLength = parentNodeList.getLength();
System.out.println("parentNodeListLength--[" + parentNodeListLength + "]");
for (int prntCtr = 0; prntCtr < parentNodeListLength; prntCtr++)
{
parentNode = parentNodeList.item(prntCtr);
System.out.println("parentNode---[" + parentNode + "]");
errCode = parentNode.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("errCode--[" + errCode + "]");
if ((errCode != null) && (errCode.trim().length() > 0))
{
errList.add(errCode);
fldList.add("");
}
}
System.out.println("errList--[" + errList + "]");
}
catch (Exception e)
{
System.out.println("exception while adding error in errList--[" + e.getMessage() + "]");
e.printStackTrace();
throw new ITMException(e);
}
}
//Modified by Anjali R. on[19/09/2018][End]
//Modified by Anjali R. on [03/08/2018][To cancel approved leave encashment entries][End] //Modified by Anjali R. on [03/08/2018][To cancel approved leave encashment entries][End]
} }
} }
...@@ -858,7 +1091,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -858,7 +1091,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
ps2.setTimestamp(27,endTime); ps2.setTimestamp(27,endTime);
//Modified by Anjali R. on[04/06/2018][To set START_TIME,END_TIME in timestamp data type][End] //Modified by Anjali R. on[04/06/2018][To set START_TIME,END_TIME in timestamp data type][End]
rowsUpdate = ps2.executeUpdate(); rowsUpdate = ps2.executeUpdate();
System.out.println("rowsUpdate----["+rowsUpdate+"]");
if(ps2 != null) if(ps2 != null)
{ {
ps2.close(); ps2.close();
...@@ -954,19 +1187,35 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -954,19 +1187,35 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
this.errXml = errCode; this.errXml = errCode;
} }
if(commit == 2) //Modified by Anjali R. on [18/09/2018][Connection commit will not happen here][Start]
/*if(commit == 2)
{ {
connectionObject.rollback(); connectionObject.rollback();
} }*/
} }
else if(commit == 2)
/*else if(commit == 2)
{ {
connectionObject.commit(); connectionObject.commit();
} }*/
//Modified by Anjali R. on [18/09/2018][Connection commit will not happen here][End]
} }
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
//Modified by Anjali R. on [18/09/2018][Start]
try
{
connectionObject.rollback();
}
catch(Exception e1)
{
System.out.println("Exception in empleave cancel component--["+e1.getMessage()+"]");
throw new ITMException(e1);
}
//Modified by Anjali R. on [18/09/2018][End]
throw new ITMException(e); throw new ITMException(e);
} }
hmap.put("ERRORCODE",this.errList); hmap.put("ERRORCODE",this.errList);
...@@ -1006,6 +1255,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1006,6 +1255,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
} }
catch (Exception e) catch (Exception e)
{ {
//Modified by Anjali R. on [18/09/2018][Start]
try
{
conn.rollback();
}
catch(Exception e1)
{
System.out.println("Exception in empleave cancel component--["+e1.getMessage()+"]");
throw new ITMException(e1);
}
//Modified by Anjali R. on [18/09/2018][End]
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
...@@ -1112,10 +1372,12 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1112,10 +1372,12 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
lveDateFrStr = genericUtility.getValidDateString(lveDateFr, genericUtility.getDBDateTimeFormat()); lveDateFrStr = genericUtility.getValidDateString(lveDateFr, genericUtility.getDBDateTimeFormat());
System.out.println("tranDateStr---["+lveDateFrStr+"]"); System.out.println("tranDateStr---["+lveDateFrStr+"]");
} }
String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn); //Modified by Anjali R. on [18/09/2018][Start]
//String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn);
if("Y".equalsIgnoreCase(allowEnvLveCancel )) //if("Y".equalsIgnoreCase(allowEnvLveCancel ))
{ //{
//Modified by Anjali R. on [18/09/2018][End]
//If encashment amount paid through voucher then ench mode is "V" ,through payroll then ench mode "P" //If encashment amount paid through voucher then ench mode is "V" ,through payroll then ench mode "P"
if("V".equalsIgnoreCase(encashMode)) if("V".equalsIgnoreCase(encashMode))
{ {
...@@ -1146,7 +1408,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1146,7 +1408,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
if(finYearErr != null && finYearErr.trim().length() > 0) if(finYearErr != null && finYearErr.trim().length() > 0)
{ {
retString = itmdbAccessEJB.getErrorString("", finYearErr, userId,"",conn); retString = itmdbAccessEJB.getErrorString("", finYearErr, userId,"",conn);
retString = finYearErr; //retString = finYearErr;
return retString; return retString;
} }
...@@ -1173,7 +1435,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1173,7 +1435,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
if("A".equalsIgnoreCase(arrearVoucherStatus)) if("A".equalsIgnoreCase(arrearVoucherStatus))
{ {
retString = itmdbAccessEJB.getErrorString("", "VTADMLVE04", "","",conn); retString = itmdbAccessEJB.getErrorString("", "VTADMLVE04", "","",conn);
retString = "VTADMLVE04"; //retString = "VTADMLVE04";
return retString; return retString;
} }
else if("X".equalsIgnoreCase(arrearVoucherStatus) || arrearVoucherStatus == null || arrearVoucherStatus.trim().length() == 0) else if("X".equalsIgnoreCase(arrearVoucherStatus) || arrearVoucherStatus == null || arrearVoucherStatus.trim().length() == 0)
...@@ -1197,7 +1459,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1197,7 +1459,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
else else
{ {
retString = itmdbAccessEJB.getErrorString("prd_code", "VTADMLVE03", "", "",conn); retString = itmdbAccessEJB.getErrorString("prd_code", "VTADMLVE03", "", "",conn);
retString = "VTADMLVE03"; //retString = "VTADMLVE03";
return retString; return retString;
} }
System.out.println("frDate--["+frDate+"]toDate--["+toDate+"]"); System.out.println("frDate--["+frDate+"]toDate--["+toDate+"]");
...@@ -1331,9 +1593,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1331,9 +1593,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave", "", adCode,enchAmt*-1 , frDateStr, toDateStr, ExtraParams, conn); retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave", "", adCode,enchAmt*-1 , frDateStr, toDateStr, ExtraParams, conn);
System.out.println("retString--["+retString+"]"); System.out.println("retString--["+retString+"]");
//Modified by Anjali R. on[19/09/2018][Start]
if(retString != null && retString.trim().length() > 0)
{
conn.rollback();
retString = itmdbAccessEJB.getErrorString("", retString, "", "",conn);
return retString;
}
//Modified by Anjali R. on[19/09/2018][End]
} }
} }
} //}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1344,7 +1614,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1344,7 +1614,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
conn.rollback(); conn.rollback();
} }
catch (SQLException e1) catch (Exception e1)
{ {
System.out.println("SQLException---["+e1.getMessage()+"]"); System.out.println("SQLException---["+e1.getMessage()+"]");
e1.printStackTrace(); e1.printStackTrace();
...@@ -1375,6 +1645,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL ...@@ -1375,6 +1645,7 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{ {
System.out.println("Exception in finally block--["+e.getMessage()+"]"); System.out.println("Exception in finally block--["+e.getMessage()+"]");
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e);
} }
} }
return retString; return retString;
......
...@@ -7,6 +7,7 @@ import java.sql.ResultSet; ...@@ -7,6 +7,7 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date;
import javax.ejb.Stateless; import javax.ejb.Stateless;
...@@ -43,7 +44,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -43,7 +44,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
{ {
conn.rollback(); conn.rollback();
System.out.println("retString---["+retString+"]"); System.out.println("retString---["+retString+"]");
retString = itmdbAccessEJB.getErrorString("", retString, "","",conn); //retString = itmdbAccessEJB.getErrorString("", retString, "","",conn);
} }
else else
{ {
...@@ -51,7 +52,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -51,7 +52,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
retString = itmdbAccessEJB.getErrorString("", "VTADMLVE02", "","",conn);//Voucher cancelled successfully message retString = itmdbAccessEJB.getErrorString("", "VTADMLVE02", "","",conn);//Voucher cancelled successfully message
} }
} }
catch (SQLException e) catch (Exception e)
{ {
System.out.println("Exception in actionHandler---["+e.getMessage()+"]"); System.out.println("Exception in actionHandler---["+e.getMessage()+"]");
e.printStackTrace(); e.printStackTrace();
...@@ -59,10 +60,12 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -59,10 +60,12 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
{ {
conn.rollback(); conn.rollback();
} }
catch (SQLException e1) catch (Exception e1)
{ {
e1.printStackTrace(); e1.printStackTrace();
throw new ITMException(e1);
} }
throw new ITMException(e);
} }
finally finally
{ {
...@@ -73,6 +76,10 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -73,6 +76,10 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
conn.close(); conn.close();
conn = null; conn = null;
} }
if(itmdbAccessEJB != null)
{
itmdbAccessEJB = null;
}
} }
catch(Exception e ) catch(Exception e )
{ {
...@@ -99,7 +106,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -99,7 +106,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
String errString = ""; String errString = "";
String payMode = ""; String payMode = "";
String retString = ""; //String retString = "";
String lveCode = ""; String lveCode = "";
String prdCodePayroll = ""; String prdCodePayroll = "";
Timestamp frDate = null; Timestamp frDate = null;
...@@ -160,8 +167,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -160,8 +167,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
if("X".equalsIgnoreCase(status)) if("X".equalsIgnoreCase(status))
{ {
//errString = itmDBAccessEJB.getErrorString("", "VTADMLVE05", chgUser,"",conn); errString = itmDBAccessEJB.getErrorString("", "VTADMLVE05", chgUser,"",conn);
errString = "VTADMLVE05"; //errString = "VTADMLVE05";
return errString; return errString;
} }
sql = "select aprv_date from empleave_ench_arr where tran_id__lve = ? AND status = 'A' order by aprv_date desc"; sql = "select aprv_date from empleave_ench_arr where tran_id__lve = ? AND status = 'A' order by aprv_date desc";
...@@ -173,8 +180,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -173,8 +180,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
confDateRem = rs.getTimestamp("aprv_date"); confDateRem = rs.getTimestamp("aprv_date");
if(ConfDateCurrent.before(confDateRem)) if(ConfDateCurrent.before(confDateRem))
{ {
//errString = itmDBAccessEJB.getErrorString("", "VTADMLVE06", chgUser,"",conn); errString = itmDBAccessEJB.getErrorString("", "VTADMLVE06", chgUser,"",conn);
errString = "VTADMLVE06"; //errString = "VTADMLVE06";
return errString; return errString;
} }
} }
...@@ -194,12 +201,56 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -194,12 +201,56 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat()); tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat());
System.out.println("tranDateStr---["+tranDateStr+"]"); System.out.println("tranDateStr---["+tranDateStr+"]");
} }
if(status != null && status.trim().length() > 0 || !status.equalsIgnoreCase("N")) //Modified by Anjali R. on [19/09/2018][Start]
/*if(status != null && status.trim().length() > 0 || !status.equalsIgnoreCase("N"))
{ {
String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn); String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn);
if("Y".equalsIgnoreCase(allowEnvLveCancel )) if("Y".equalsIgnoreCase(allowEnvLveCancel ))
{*/
if(status != null && status.trim().length() > 0 && status.equalsIgnoreCase("A"))
{
String siteCode = "" , cadreCode = "" , gradeCode = "";
sql = "SELECT PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
while(rs.next())
{
siteCode = checkNull(rs.getString("PAY_SITE"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String currDateStr = sdf.format(new Date());
Timestamp currDateTime = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(currDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
String allowEnvLveCancel = checkNull(admCommon.getAdmEnv(siteCode, cadreCode,gradeCode , "ALLOW_CANCEL_LVEENC", currDateTime, conn));
if("NULLFOUND".equalsIgnoreCase(allowEnvLveCancel))
{
allowEnvLveCancel = checkNull(admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn));
}
if(!("Y".equalsIgnoreCase(allowEnvLveCancel )))
{ {
//NOT DEFINED / VALUE "N" - ALLOW_CANCEL_LVEENC
errString = itmDBAccessEJB.getErrorString("", "VTADMLVE07", "", "",conn);
return errString;
}
else
{
//Modified by Anjali R. on [19/09/2018][End]
if("V".equalsIgnoreCase(payMode)) if("V".equalsIgnoreCase(payMode))
{ {
...@@ -229,14 +280,14 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -229,14 +280,14 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
if(accountingYearerror != null && accountingYearerror.trim().length() > 0) if(accountingYearerror != null && accountingYearerror.trim().length() > 0)
{ {
//errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn); errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn);
errString = accountingYearerror; //errString = accountingYearerror;
return errString; return errString;
} }
//Cal HRVoucherReversal component to generate reversal voucher //Cal HRVoucherReversal component to generate reversal voucher
retString = hrVoucherReversal.actionHandler(tranIdVoucher, xtraParams, forcedFlag, conn); errString = hrVoucherReversal.actionHandler(tranIdVoucher, xtraParams, forcedFlag, conn);
System.out.println("retString---["+retString+"]"); System.out.println("errString---["+errString+"]");
/*if(retString == null || retString.trim().length() == 0) /*if(retString == null || retString.trim().length() == 0)
{ {
...@@ -250,6 +301,10 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -250,6 +301,10 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
pstmt = null; pstmt = null;
} }
}*/ }*/
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} }
else if("P".equalsIgnoreCase(payMode)) else if("P".equalsIgnoreCase(payMode))
...@@ -265,9 +320,9 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -265,9 +320,9 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
} }
else else
{ {
//retString = itmDBAccessEJB.getErrorString("prd_code", "VTADMLVE03", "", "",conn); errString = itmDBAccessEJB.getErrorString("prd_code", "VTADMLVE03", "", "",conn);
retString = "VTADMLVE03"; //retString = "VTADMLVE03";
return retString; return errString;
} }
System.out.println("frDate--["+frDate+"]toDate--["+toDate+"]"); System.out.println("frDate--["+frDate+"]toDate--["+toDate+"]");
if(rs != null) if(rs != null)
...@@ -398,18 +453,20 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -398,18 +453,20 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
System.out.println("count--["+count+"]"); System.out.println("count--["+count+"]");
if(count > 0) if(count > 0)
{ {
retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn); errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
System.out.println("retString--["+retString+"]"); System.out.println("errString--["+errString+"]");
if(retString != null && retString.trim().length()>0) if(errString != null && errString.trim().length()>0)
{ {
return retString; //payarrToProcUpdation method returns only error code
errString = itmDBAccessEJB.getErrorString("", errString, "", "",conn);
return errString;
} }
} }
} }
} }
} }
if(retString == null || retString.trim().length() == 0) if(errString == null || errString.trim().length() == 0)
{ {
sql = "update empleave_ench_arr set status = 'X' where tran_id = ?"; sql = "update empleave_ench_arr set status = 'X' where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -428,6 +485,16 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -428,6 +485,16 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
conn.rollback(); conn.rollback();
System.out.println("Exception in actionHandler [LveEncArrCanc]----["+e.getMessage()+"]"); System.out.println("Exception in actionHandler [LveEncArrCanc]----["+e.getMessage()+"]");
e.printStackTrace(); e.printStackTrace();
try
{
conn.rollback();
}
catch(Exception e1)
{
System.out.println();
e1.printStackTrace();
throw new ITMException(e1);
}
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
...@@ -443,8 +510,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc ...@@ -443,8 +510,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
pstmt = null; pstmt = null;
} }
} }
return retString; return errString;
} }
private String checkNull(String input) private String checkNull(String input)
{ {
......
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