Commit d8b7c00d authored by sghate's avatar sghate

Done migration related changes in EmpMaritalStatusIC Component

EmpMaritalStatusCancel.java
EmpMaritalStatusConf.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214557 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 91a4d4f0
...@@ -32,16 +32,15 @@ import ibase.webitm.ejb.sys.UtilMethods; ...@@ -32,16 +32,15 @@ import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
//import ibase.webitm.utility.TransIDGenerator; //import ibase.webitm.utility.TransIDGenerator;
import javax.ejb.Stateless; // added for ejb3 //modified by Shital on 12/08/2019 [Start]
//import javax.ejb.Stateless; // added for ejb3
//@Stateless
//modified by Shital on 12/08/2019 [End]
@Stateless
public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMaritalStatusCancelLocal,EmpMaritalStatusCancelRemote public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMaritalStatusCancelLocal,EmpMaritalStatusCancelRemote
{ {
int updateMaritalChgCount=0; int updateMaritalChgCount = 0;
E12GenericUtility genericUtility= new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
@Override @Override
public String actionHandler() throws RemoteException,ITMException public String actionHandler() throws RemoteException,ITMException
{ {
...@@ -77,6 +76,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -77,6 +76,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
System.out.println("returning String from LoanOpeningCncEJB :actionHandler :"+retString); System.out.println("returning String from LoanOpeningCncEJB :actionHandler :"+retString);
return retString; return retString;
} }
public String actionCancel(String tranID, String xtraParams, String forcedFlag) throws RemoteException, ITMException public String actionCancel(String tranID, String xtraParams, String forcedFlag) throws RemoteException, ITMException
// public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException, ITMException // public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException, ITMException
{ {
...@@ -84,73 +84,150 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -84,73 +84,150 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
System.out.println("Inside EmpMaritalStatusCancel cancel() method"); System.out.println("Inside EmpMaritalStatusCancel cancel() method");
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null,pstmt1=null; PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "", sql1 = ""; String sql = "";
ConnDriver connDriver = null; String sql1 = "";
Timestamp tranDateTimestamp=null; //modified by Shital on 12/08/2019 [Start]
Timestamp statusDateTimeStamp=null; //ConnDriver connDriver = null;
Timestamp confDtTimestamp=null,prvStatDtTimestamp=null; //modified by Shital on 12/08/2019 [End]
Timestamp tranDate=null; //ADDED BY AMIT SHRIVASTAVA ON [ A15ISUN003 ]30/11/18[START]
Timestamp chgDate=null; Timestamp tranDateTimestamp = null;
Timestamp frDate=null; //ADDED BY AMIT SHRIVASTAVA ON [ A15ISUN003 ]30/11/18[END].
Timestamp toDate=null; Timestamp statusDateTimeStamp = null;
Timestamp confDate=null; Timestamp confDtTimestamp = null;
Timestamp prvStatDtTimestamp = null;
Timestamp tranDate = null;
Timestamp chgDate = null;
Timestamp frDate = null;
Timestamp toDate = null;
Timestamp confDate = null;
InitialContext initialCtx = null; InitialContext initialCtx = null;
//ITMDBAccessLocal itmDBAccess = null; //Commented by sarita on 20 JULY 18 ITMDBAccessLocal itmDBAccess = null;
AppConnectParm appConnect = null; AppConnectParm appConnect = null;
AdmCommon admCommon=null; AdmCommon admCommon=null;
//Commented by sarita on 20 JULY 18 to create object of PayrollVoucherConfLocal [START] PayrollVoucherConfLocal payrollVoucherConf = null;
//PayrollVoucherConfLocal payrollVoucherConf = null;
PayrollVoucherConf payrollVoucherConf = new PayrollVoucherConf();
//Commented by sarita on 20 JULY 18 to create object of PayrollVoucherConfLocal [END]
boolean latestTran=true; boolean latestTran=true;
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>(); ArrayList<String> errFields = new ArrayList<String>();
String empCode = "",tranDateStr=""; String empCode = "";
String loginEmpCode = "", shortName = "", empFName = "", empMName = "", empLName = "", loginCode = "", chgTerm = "", String tranDateStr="";
newStatus="",amount="",confirmStatus="",voucherNo="",chgUser="",msgType="",autoPost=""; String loginEmpCode = "";
String prvEmpFname="",prvEmpMname="",prvEmpLname="",prvSpouseName="",prvShortName="",oldStatus="",retString=""; String shortName = "";
String empFName = "";
String paySite="",withHeld="",empCctrCodeSal="",empBankCode="",empDeptCode=""; String empMName = "";
String empLName = "";
String loginCode = "";
String chgTerm = "";
String newStatus = "";
String amount = "";
String confirmStatus = "";
String voucherNo = "";
String chgUser = "";
String msgType = "";
String autoPost = "";
String prvEmpFname = "";
String prvEmpMname = "";
String prvEmpLname = "";
String prvSpouseName = "";
String prvShortName = "";
String oldStatus = "";
String retString = "";
String paySite = "";
String withHeld = "";
String empCctrCodeSal = "";
String empBankCode = "";
String empDeptCode = "";
Date relieveDate = null; Date relieveDate = null;
String tranType="",reffNo="",bankCode="",autoPay="",payMode="",siteCode="",finEntity="",remarks="",analCode="",confirmed="",paid="", String tranType = "";
acctCodePay="",cctrCodePay="",entryBatchNo="",vouchType="",currCode="",exchRate="",hold="",newVouchNo="",siteCodeAcct="",xmlString="", String reffNo = "";
acctCode="",cctrCode="",adCode=""; String bankCode = "";
double totAmt=0.00,totAmtBc=0.00,amountDet=0.00; String autoPay = "";
String empMStatus="",empNamePrefix="",empFname="",empMname="",empLname="",empShortName="",empStatus=""; String payMode = "";
String tempEmpFname="",tempEmpMname="",tempEmpLname="",tempEmpShortName="",cnfStat="",statusDateStr=""; String siteCode = "";
String finEntity = "";
Timestamp vouchDate=null,effDate=null,reffDate=null,refDate=null,empMStatusDate=null; String remarks = "";
String analCode = "";
String confirmed = "";
String paid = "";
String acctCodePay = "";
String cctrCodePay = "";
String entryBatchNo = "";
String vouchType = "";
String currCode = "";
String exchRate = "";
String hold = "";
String newVouchNo = "";
String siteCodeAcct = "";
String xmlString = "";
String acctCode = "";
String cctrCode ="";
String adCode = "";
double totAmt = 0.00;
double totAmtBc = 0.00;
double amountDet = 0.00;
String empMStatus = "";
String empNamePrefix = "";
String empFname = "";
String empMname = "";
String empLname = "";
String empShortName = "";
String empStatus = "";
String tempEmpFname = "";
String tempEmpMname = "";
String tempEmpLname = "";
String tempEmpShortName = "";
String cnfStat = "";
String statusDateStr = "";
//Added By Sanket J on 01/March/18 for [new column to handle long value employee names]
String empFnameLong = "";
String empMnameLong = "";
String empLnameLong = "";
Timestamp vouchDate = null;
Timestamp effDate = null;
Timestamp reffDate = null;
Timestamp refDate = null;
Timestamp empMStatusDate = null;
String winName = "w_payr_voucher"; String winName = "w_payr_voucher";
int lineNo=0; int lineNo = 0;
int updateEmployeeCount=0; int updateEmployeeCount = 0;
long dayDiff=0; long dayDiff = 0;
//modified by Shital on 12/08/2019 [Start]
connDriver = null; //connDriver = null;
//modified by Shital on 12/08/2019 [End]
String errString = ""; String errString = "";
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
int cnt=0; int cnt = 0;
Timestamp sysDate = null; Timestamp sysDate = null;
E12GenericUtility genericUtility=new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
StringBuffer xmlBuff=null; StringBuffer xmlBuff = null;
/* Added by vinay 13/03/2019 */
String empPaySite = "";
String empWorkSite = "";
String empSite = "";
/* Added by vinay 13/03/2019 */
try try
{ {
//modified by Shital on 12/08/2019 [Start]
connDriver = new ConnDriver(); //connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
connDriver = null; //connDriver = null;
conn = getConnection();
//modified by Shital on 12/08/2019 [End]
conn.setAutoCommit(false); conn.setAutoCommit(false);
//Commented by sarita to create object of ITMDBAccessEJB instead ITMDBAccessLocal on 20 JULY 18.[START]
/* appConnect = new AppConnectParm(); /* appConnect = new AppConnectParm();
initialCtx = new InitialContext(appConnect.getProperty()); initialCtx = new InitialContext(appConnect.getProperty());
itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");*/ itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");*/
//Commented by sarita to create object of ITMDBAccessEJB instead ITMDBAccessLocal on 20 JULY 18.[END]
UtilMethods uMth=new UtilMethods(); UtilMethods uMth=new UtilMethods();
...@@ -166,7 +243,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -166,7 +243,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
chgDate=Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) chgDate=Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())
+ " 00:00:00.0"); + " 00:00:00.0");
System.out.println("@V@ Tran Id fornd by transaction :- ["+tranID+"]"); System.out.println("@V@ Tran Id fornd by transaction :- ["+tranID+"]");
String pkArray[]=tranID.split(":"); String pkArray[]=tranID.split(":");
System.out.println("@V@ PK array length :-["+pkArray.length+"]"); System.out.println("@V@ PK array length :-["+pkArray.length+"]");
...@@ -174,10 +250,14 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -174,10 +250,14 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
System.out.println("@V@ Emp code :- ["+pkArray[1]+"]"); System.out.println("@V@ Emp code :- ["+pkArray[1]+"]");
// tranDateStr = genericUtility.getValidDateTimeString(pkArray[0], genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); // tranDateStr = genericUtility.getValidDateTimeString(pkArray[0], genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
tranDateStr = pkArray[0]; tranDateStr = pkArray[0];
System.out.println("@Amit ::: tranDateStr@"+tranDateStr);
// tranDateTimestamp = Timestamp.valueOf(pkArray[0]); // tranDateTimestamp = Timestamp.valueOf(pkArray[0]);
tranDateTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(pkArray[0], genericUtility.getApplDateFormat() tranDateTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(pkArray[0], genericUtility.getApplDateFormat()
,genericUtility.getDBDateFormat())); ,genericUtility.getDBDateFormat()));
System.out.println("@Amit @ tranDateTimestamp::::"+tranDateTimestamp);
empCode=pkArray[1]; empCode=pkArray[1];
sql = "SELECT NEW_STATUS, SHORT_NAME, EMP_FNAME, EMP_MNAME, EMP_LNAME, STATUS_DATE, AMOUNT, CONFIRM,VOUCHER_NO," + sql = "SELECT NEW_STATUS, SHORT_NAME, EMP_FNAME, EMP_MNAME, EMP_LNAME, STATUS_DATE, AMOUNT, CONFIRM,VOUCHER_NO," +
...@@ -198,26 +278,41 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -198,26 +278,41 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
amount = checkNull(rs.getString("AMOUNT")); amount = checkNull(rs.getString("AMOUNT"));
confirmStatus = checkNull(rs.getString("CONFIRM")); confirmStatus = checkNull(rs.getString("CONFIRM"));
voucherNo = checkNull(rs.getString("VOUCHER_NO")); voucherNo = checkNull(rs.getString("VOUCHER_NO"));
prvEmpFname = checkNull(rs.getString("EMP_FNAME__O")); /***prvEmpMname = checkNull(rs.getString("EMP_MNAME__O"));
System.out.println("prvFNAME"+prvEmpFname); * prvEmpMname = checkNull(rs.getString("EMP_MNAME__O"));
prvEmpMname = checkNull(rs.getString("EMP_MNAME__O"));
prvEmpLname = checkNull(rs.getString("EMP_LNAME__O")); prvEmpLname = checkNull(rs.getString("EMP_LNAME__O"));
* Commented by santosh on 16-JAN-2019 to
set null for Female in employee table*/
prvEmpFname = replaceNull(rs.getString("EMP_FNAME__O"));
System.out.println("prvFNAME"+prvEmpFname);
prvEmpMname = replaceNull(rs.getString("EMP_MNAME__O"));
prvEmpLname = replaceNull(rs.getString("EMP_LNAME__O"));
System.out.println("@S@>>>prvEmpMname["+prvEmpMname+"]prvEmpLname["+prvEmpLname+"]");
prvShortName = checkNull(rs.getString("SHORT_NAME__O")); prvShortName = checkNull(rs.getString("SHORT_NAME__O"));
oldStatus = checkNull(rs.getString("OLD_STATUS")); oldStatus = checkNull(rs.getString("OLD_STATUS"));
confDtTimestamp = rs.getTimestamp("CONF_DATE"); confDtTimestamp = rs.getTimestamp("CONF_DATE");
prvStatDtTimestamp = rs.getTimestamp("STATUS_DATE__O"); prvStatDtTimestamp = rs.getTimestamp("STATUS_DATE__O");
System.out.println("@amit@+voucherNo::"+voucherNo);
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
//modified by Shital on 12/08/2019 [Start]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
//modified by Shital on 12/08/2019 [End]
if(statusDateTimeStamp!=null){ if(statusDateTimeStamp != null)
String statuscheck=statusDateTimeStamp.toString(); {
try { String statuscheck = statusDateTimeStamp.toString();
statuscheck=""; try
} catch (Exception e) { {
statuscheck=""; statuscheck = "";
}
catch (Exception e)
{
statuscheck = "";
} }
statusDateStr=genericUtility.getValidDateString(statusDateTimeStamp.toString(), genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); statusDateStr=genericUtility.getValidDateString(statusDateTimeStamp.toString(), genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
System.out.println("@V@ Status date str :- ["+statusDateStr+"]"); System.out.println("@V@ Status date str :- ["+statusDateStr+"]");
...@@ -229,7 +324,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -229,7 +324,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
System.out.println("empMName :-[" + empMName+"]"); System.out.println("empMName :-[" + empMName+"]");
System.out.println("empLName :-[" + empLName+"]"); System.out.println("empLName :-[" + empLName+"]");
/** /**
* Check un-confirmed transaction exist * Check un-confirmed transaction exist
* for employee * for employee
...@@ -244,13 +338,15 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -244,13 +338,15 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
{ {
cnt = rs.getInt("cnt"); cnt = rs.getInt("cnt");
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
System.out.println("@V@ Un confirm transaction count :- ["+cnt+"]"); System.out.println("@V@ Un confirm transaction count :- ["+cnt+"]");
if(cnt>0) if(cnt > 0)
{ {
errList.add("VTUNCFEXT"); errList.add("VTUNCFEXT");
errFields.add("confirm"); errFields.add("confirm");
...@@ -260,7 +356,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -260,7 +356,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
* Select all confirm date * Select all confirm date
* */ * */
// ArrayList<Timestamp> tranDateAll=new ArrayList<Timestamp>(); // ArrayList<Timestamp> tranDateAll=new ArrayList<Timestamp>();
ArrayList<Timestamp> confDateAll=new ArrayList<Timestamp>(); ArrayList<Timestamp> confDateAll = new ArrayList<Timestamp>();
sql = "SELECT CASE WHEN CONFIRM IS NULL THEN 'N' ELSE CONFIRM END AS CONFIRM_STAT,CONF_DATE" + sql = "SELECT CASE WHEN CONFIRM IS NULL THEN 'N' ELSE CONFIRM END AS CONFIRM_STAT,CONF_DATE" +
" FROM EMP_MARITALCHG WHERE EMP_CODE = ?"; " FROM EMP_MARITALCHG WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -275,24 +371,25 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -275,24 +371,25 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
confDateAll.add(confDate); confDateAll.add(confDate);
} }
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
if(confDtTimestamp!=null) if(confDtTimestamp != null)
{ {
for(Timestamp tempDate:confDateAll) for(Timestamp tempDate:confDateAll)
{ {
if(confDtTimestamp.before(tempDate)) if(confDtTimestamp.before(tempDate))
{ {
latestTran=false; latestTran = false;
break; break;
} }
} }
} }
/** /**
* Check transaction is already Canceled * Check transaction is already Canceled
* */ * */
...@@ -323,33 +420,43 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -323,33 +420,43 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
* Check the old voucher voucher * Check the old voucher voucher
* is in same financial year * is in same financial year
* */ * */
if(voucherNo!=null && voucherNo.trim().length()>0) if(voucherNo != null && voucherNo.trim().length() > 0)
{ { //Adde By Amit Shrivastava on 31/01/19 [Start]
sql = "select FN_CHECK_ACCOUNTING_YEAR(?,?,?,?) as err_code from dual"; /*sql = "select FN_CHECK_ACCOUNTING_YEAR(?,?,?,?) as err_code from dual";*/
sql = "select FN_CHECK_ACCOUNTING_YEAR(?,?,?,?,?) as err_code from dual";
//Adde By Amit Shrivastava on 31/01/19 [end]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setString(2, voucherNo); pstmt.setString(2, voucherNo);
pstmt.setString(3, chgUser); pstmt.setString(3, chgUser);
pstmt.setString(4, tranDateStr); /*pstmt.setString(4, tranDateStr);*/
// CHANGES BY AMIT SHRIVASTAVA ON 29/NOV/18 [START]
System.out.println("@Amit @in tran date "+tranDateStr);
pstmt.setTimestamp(4, tranDateTimestamp);
/*pstmt.setTimestamp(4, java.sql.Timestamp.valueOf(tranDateStr));*/
// CHANGES BY AMIT SHRIVASTAVA ON 29/NOV/18 [END].
//Adde By Amit Shrivastava on 31/01/19 [Start]
pstmt.setString(5, "EMP_MARITAL_CAN");
//Adde By Amit Shrivastava on 31/01/19 [end]
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
errString = rs.getString("err_code"); errString = rs.getString("err_code");
} }
rs.close(); /*rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;*/
close( pstmt, rs);
if(errString!=null && errString.trim().length()>0) if(errString != null && errString.trim().length() > 0)
{ {
errList.add(errString); errList.add(errString);
errFields.add("tran_date"); errFields.add("tran_date");
} }
} }
int errListSize = errList.size(); int errListSize = errList.size();
StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
...@@ -364,8 +471,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -364,8 +471,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
System.out.println("errFldName .........." + errFldName); System.out.println("errFldName .........." + errFldName);
System.out.println("chg_user .........." + chgUser); System.out.println("chg_user .........." + chgUser);
ValidatorEJB vb=new ValidatorEJB(); ValidatorEJB vb=new ValidatorEJB();
//modified by Shital on 12/08/2019 [Start]
errString = vb.getErrorString(errFldName, errCode, chgUser); //errString = vb.getErrorString(errFldName, errCode, chgUser);
errString = itmDBAccessEJB.getErrorString(errFldName, errCode, chgUser, "", conn);
//modified by Shital on 12/08/2019 [End]
System.out.println("errString is : ::::>>>> " + errString); System.out.println("errString is : ::::>>>> " + errString);
msgType = errorType(conn, errCode); msgType = errorType(conn, errCode);
if (errString.length() > 0) if (errString.length() > 0)
...@@ -397,7 +506,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -397,7 +506,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
/** /**
* Check NO ERROR BEFORE EXECUTION. * Check NO ERROR BEFORE EXECUTION.
* */ * */
if(errString.trim().length()==0) if(errString.trim().length() == 0)
{ {
/** /**
* Select name prefix * Select name prefix
...@@ -412,10 +521,12 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -412,10 +521,12 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
namePrefix = checkNull(rs.getString("NAME_PREFIX")); namePrefix = checkNull(rs.getString("NAME_PREFIX"));
sex = checkNull(rs.getString("SEX")); sex = checkNull(rs.getString("SEX"));
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
/** /**
* If Female * If Female
...@@ -425,53 +536,63 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -425,53 +536,63 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
{ {
namePrefix = "Miss"; namePrefix = "Miss";
tempEmpFname=empFName; tempEmpFname = empFName;
tempEmpMname=empMName; tempEmpMname = empMName;
tempEmpLname=empLName; tempEmpLname = empLName;
tempEmpShortName=shortName; tempEmpShortName = shortName;
empFName=prvEmpFname; empFName = prvEmpFname;
empMName=prvEmpMname; empMName = prvEmpMname;
empLName=prvEmpLname; empLName = prvEmpLname;
shortName=prvShortName; shortName = prvShortName;
} }
else else
{ {
tempEmpFname=empFName; tempEmpFname = empFName;
tempEmpMname=empMName; tempEmpMname = empMName;
tempEmpLname=empLName; tempEmpLname = empLName;
tempEmpShortName=shortName; tempEmpShortName = shortName;
} }
/** /**
* Select employee details * Select employee details
* */ * */
sql="select M_STATUS , M_STATUS_DATE , NAME_PREFIX , EMP_FNAME , EMP_MNAME , EMP_LNAME , SHORT_NAME, STATUS" + //Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]
/*sql="select M_STATUS , M_STATUS_DATE , NAME_PREFIX , EMP_FNAME , EMP_MNAME , EMP_LNAME , SHORT_NAME, STATUS" +
" from employee WHERE EMP_CODE = ?";*/
sql = "select M_STATUS , M_STATUS_DATE , NAME_PREFIX , EMP_FNAME , EMP_MNAME , EMP_LNAME , SHORT_NAME, STATUS, EMP_FNAME_LONG, EMP_MNAME_LONG, EMP_LNAME_LONG" +
" from employee WHERE EMP_CODE = ?"; " from employee WHERE EMP_CODE = ?";
pstmt=conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
rs=pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
empMStatus=checkNull(rs.getString("M_STATUS")); empMStatus = checkNull(rs.getString("M_STATUS"));
empMStatusDate=rs.getTimestamp("M_STATUS_DATE"); empMStatusDate = rs.getTimestamp("M_STATUS_DATE");
empNamePrefix=checkNull(rs.getString("NAME_PREFIX")); empNamePrefix = checkNull(rs.getString("NAME_PREFIX"));
//modified by Santosh Gupta to check whether Fname,Lname,Mname are same EMP_MARITALCHG and employee(10/4/17) //modified by Santosh Gupta to check whether Fname,Lname,Mname are same EMP_MARITALCHG and employee(10/4/17)
//empFname=checkNull(rs.getString("EMP_FNAME")); //empFname=checkNull(rs.getString("EMP_FNAME"));
//empMname=checkNull(rs.getString("EMP_MNAME")); //empMname=checkNull(rs.getString("EMP_MNAME"));
//empLname=checkNull(rs.getString("EMP_LNAME")); //empLname=checkNull(rs.getString("EMP_LNAME"));
empFname=replaceNull(rs.getString("EMP_FNAME")); empFname = replaceNull(rs.getString("EMP_FNAME"));
empMname=replaceNull(rs.getString("EMP_MNAME")); empMname = replaceNull(rs.getString("EMP_MNAME"));
empLname=replaceNull(rs.getString("EMP_LNAME")); empLname = replaceNull(rs.getString("EMP_LNAME"));
//empShortName=checkNull(rs.getString("SHORT_NAME")); //empShortName=checkNull(rs.getString("SHORT_NAME"));
empShortName=replaceNull(rs.getString("SHORT_NAME")); empShortName = replaceNull(rs.getString("SHORT_NAME"));
empStatus=checkNull(rs.getString("STATUS")); empStatus = checkNull(rs.getString("STATUS"));
} //Added By Sanket J on 01/March/18 for [new column to handle long value employee names]-[Start]
pstmt.close(); empFnameLong = replaceNull(rs.getString("EMP_FNAME_LONG"));
empMnameLong = replaceNull(rs.getString("EMP_MNAME_LONG"));
empLnameLong = replaceNull(rs.getString("EMP_LNAME_LONG"));
//Added By Sanket J on 01/March/18 for [new column to handle long value employee names]-[End]
}
//Changed By sanket on 08/MAR/18 [for properly closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
/** /**
* Check status date * Check status date
...@@ -482,17 +603,14 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -482,17 +603,14 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
System.out.println("@V@ Marital status date :- ["+statusDateTimeStamp+"]"); System.out.println("@V@ Marital status date :- ["+statusDateTimeStamp+"]");
if("Y".equalsIgnoreCase(confirmStatus)) if("Y".equalsIgnoreCase(confirmStatus))
{ {
if((empMStatusDate!=null && statusDateTimeStamp!=null)) if((empMStatusDate != null && statusDateTimeStamp != null))
{ {
dayDiff=uMth.DaysAfter(empMStatusDate, statusDateTimeStamp); dayDiff = uMth.DaysAfter(empMStatusDate, statusDateTimeStamp);
System.out.println("@V@ Days diffrence :- ["+dayDiff+"]"); System.out.println("@V@ Days diffrence :- ["+dayDiff+"]");
if(dayDiff!=0) if(dayDiff!=0)
{ {
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VTSTDTDIFF", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VTSTDTDIFF", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTSTDTDIFF", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
return errString; return errString;
} }
} }
...@@ -500,17 +618,13 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -500,17 +618,13 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
if("S".equalsIgnoreCase(empStatus)) if("S".equalsIgnoreCase(empStatus))
{ {
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VTEMPSEPRT", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VTEMPSEPRT", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTEMPSEPRT", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
return errString; return errString;
} }
/** /**
* Check voucher is generated * Check voucher is generated
* */ * */
if("Y".equalsIgnoreCase(confirmStatus) && (voucherNo!=null && voucherNo.trim().length()>0)) if("Y".equalsIgnoreCase(confirmStatus) && (voucherNo != null && voucherNo.trim().length() > 0))
{ {
System.out.println("@V@ In Reverce Voucher"); System.out.println("@V@ In Reverce Voucher");
/** /**
...@@ -529,10 +643,12 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -529,10 +643,12 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
empBankCode = checkNull(rs.getString("BANK_CODE")); empBankCode = checkNull(rs.getString("BANK_CODE"));
empDeptCode = checkNull(rs.getString("DEPT_CODE")); empDeptCode = checkNull(rs.getString("DEPT_CODE"));
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
sql = "SELECT FIN_ENTITY, SITE_CODE__ACCT FROM SITE WHERE SITE_CODE = ?"; sql = "SELECT FIN_ENTITY, SITE_CODE__ACCT FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -543,76 +659,104 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -543,76 +659,104 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
siteCodeAcct = checkNull(rs.getString("SITE_CODE__ACCT")); siteCodeAcct = checkNull(rs.getString("SITE_CODE__ACCT"));
finEntity = checkNull(rs.getString("FIN_ENTITY")); finEntity = checkNull(rs.getString("FIN_ENTITY"));
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
int hdrUpdate=0, detUpdate=0; int hdrUpdate = 0, detUpdate = 0;
// admCommon= new AdmCommon(); // admCommon= new AdmCommon();
// autoPost = checkNull(admCommon.getEnv("999999", "AUTO_POST", conn)); // autoPost = checkNull(admCommon.getEnv("999999", "AUTO_POST", conn));
autoPost=getAutoPostValue(empCode,"AUTO_POST",conn); autoPost = getAutoPostValue(empCode,"AUTO_POST",conn);
if("NULLFOUND".equalsIgnoreCase(autoPost)) if("NULLFOUND".equalsIgnoreCase(autoPost))
{ {
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
return errString; return errString;
} }
System.out.println("@V@ At cancelation AutoPost value :- ["+autoPost+"]"); System.out.println("@V@ At cancelation AutoPost value :- ["+autoPost+"]");
/* Start:Added by vinay 13/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
sql = "SELECT PAY_SITE,WORK_SITE,EMP_SITE FROM EMPLOYEE where emp_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
empPaySite = rs.getString("PAY_SITE");
empWorkSite = rs.getString("WORK_SITE");
empSite = rs.getString("EMP_SITE");
}
close(pstmt, rs);
System.out.println("@vinay::actionHandler::empPaySite>>"+empPaySite);
System.out.println("@vinay::actionHandler::empWorkSite>>"+empWorkSite);
System.out.println("@vinay::actionHandler::empSite>>"+empSite);
/* End:Added by vinay 13/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
/* Commented by vinay 13/03/2019
newVouchNo = generateTranId(winName, siteCodeAcct, tranDateStr, conn); newVouchNo = generateTranId(winName, siteCodeAcct, tranDateStr, conn);
System.out.println("@V@ tranId generated :: "+newVouchNo); */
/*START:Added by vinay 13/03/2019 */
newVouchNo=generateTranIdForPayrollVoucherCancel(winName,siteCodeAcct,empPaySite,empWorkSite,empSite,tranDateStr,conn);
/*END:Added by vinay 13/03/2019 */
System.out.println("@vinay@ tranId generated :: "+newVouchNo);
sql="select TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " + sql = "select TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " +
"BANK_CODE, AUTO_PAY, PAY_MODE, SITE_CODE, FIN_ENTITY, REMARKS, " + "BANK_CODE, AUTO_PAY, PAY_MODE, SITE_CODE, FIN_ENTITY, REMARKS, " +
"ANAL_CODE, CONFIRMED, PAID, ACCT_CODE__PAY, CCTR_CODE__PAY, TOT_AMT, ENTRY_BATCH_NO, VOUCH_TYPE, " + "ANAL_CODE, CONFIRMED, PAID, ACCT_CODE__PAY, CCTR_CODE__PAY, TOT_AMT, ENTRY_BATCH_NO, VOUCH_TYPE, " +
"CURR_CODE, EXCH_RATE, TOT_AMT__BC, HOLD from PAYR_VOUCHER where TRAN_ID=?"; "CURR_CODE, EXCH_RATE, TOT_AMT__BC, HOLD from PAYR_VOUCHER where TRAN_ID=?";
pstmt=conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, voucherNo); pstmt.setString(1,voucherNo);
rs=pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
tranType=checkNull(rs.getString("TRAN_TYPE")); tranType = checkNull(rs.getString("TRAN_TYPE"));
effDate=rs.getTimestamp("EFF_DATE"); effDate = rs.getTimestamp("EFF_DATE");
empCode=checkNull(rs.getString("EMP_CODE")); empCode = checkNull(rs.getString("EMP_CODE"));
// refNo="RV-"+sysDateStr; // refNo="RV-"+sysDateStr;
refDate=rs.getTimestamp("REF_DATE"); refDate = rs.getTimestamp("REF_DATE");
bankCode=checkNull(rs.getString("BANK_CODE")); bankCode = checkNull(rs.getString("BANK_CODE"));
autoPay=checkNull(rs.getString("AUTO_PAY")); autoPay = checkNull(rs.getString("AUTO_PAY"));
payMode=checkNull(rs.getString("PAY_MODE")); payMode = checkNull(rs.getString("PAY_MODE"));
siteCode=checkNull(rs.getString("SITE_CODE")); siteCode = checkNull(rs.getString("SITE_CODE"));
finEntity=checkNull(rs.getString("FIN_ENTITY")); finEntity = checkNull(rs.getString("FIN_ENTITY"));
remarks=checkNull(rs.getString("REMARKS")); remarks = checkNull(rs.getString("REMARKS"));
analCode=checkNull(rs.getString("ANAL_CODE")); analCode = checkNull(rs.getString("ANAL_CODE"));
paid=checkNull(rs.getString("PAID")); paid = checkNull(rs.getString("PAID"));
acctCodePay=rs.getString("ACCT_CODE__PAY"); acctCodePay = rs.getString("ACCT_CODE__PAY");
cctrCodePay=rs.getString("CCTR_CODE__PAY"); cctrCodePay = rs.getString("CCTR_CODE__PAY");
totAmt=rs.getDouble("TOT_AMT"); totAmt = rs.getDouble("TOT_AMT");
entryBatchNo=checkNull(rs.getString("ENTRY_BATCH_NO")); entryBatchNo = checkNull(rs.getString("ENTRY_BATCH_NO"));
vouchType=checkNull(rs.getString("VOUCH_TYPE")); vouchType = checkNull(rs.getString("VOUCH_TYPE"));
currCode=checkNull(rs.getString("CURR_CODE")); currCode = checkNull(rs.getString("CURR_CODE"));
exchRate=checkNull(rs.getString("EXCH_RATE")); exchRate = checkNull(rs.getString("EXCH_RATE"));
totAmtBc=rs.getDouble("TOT_AMT__BC"); totAmtBc = rs.getDouble("TOT_AMT__BC");
hold=checkNull(rs.getString("HOLD")); hold = checkNull(rs.getString("HOLD"));
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
System.out.println("@V@ Inserting Payer_voucher"); System.out.println("@V@ Inserting Payer_voucher");
//Modified by Santosh Gupta START //Modified by Santosh Gupta START
String refId=""; String refId = "";
if(statusDateStr==null || statusDateStr.length()==0) if(statusDateStr == null || statusDateStr.length() == 0)
{ {
refId="RV-"+newVouchNo; refId = "RV-"+newVouchNo;
}else }else
{ {
refId="RV-"+statusDateStr; refId = "RV-"+statusDateStr;
} }
//Modified by Santosh Gupta END //Modified by Santosh Gupta END
sql = " INSERT INTO PAYR_VOUCHER (TRAN_ID, TRAN_DATE, TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " + sql = " INSERT INTO PAYR_VOUCHER (TRAN_ID, TRAN_DATE, TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " +
...@@ -653,21 +797,21 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -653,21 +797,21 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
int payrVoucherInsertCount = pstmt.executeUpdate(); int payrVoucherInsertCount = pstmt.executeUpdate();
System.out.println("@V@ row insert into payr_voucher :: " + payrVoucherInsertCount); System.out.println("@V@ row insert into payr_voucher :: " + payrVoucherInsertCount);
pstmt.close(); pstmt.close();
pstmt=null; pstmt = null;
sql="select LINE_NO, ACCT_CODE, CCTR_CODE, AMOUNT, AD_CODE from PAYR_VOUCHDET where tran_id=?"; sql = "select LINE_NO, ACCT_CODE, CCTR_CODE, AMOUNT, AD_CODE from PAYR_VOUCHDET where tran_id=?";
pstmt=conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, voucherNo); pstmt.setString(1, voucherNo);
rs=pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
lineNo=rs.getInt("LINE_NO"); lineNo = rs.getInt("LINE_NO");
acctCode=checkNull(rs.getString("ACCT_CODE")); acctCode = checkNull(rs.getString("ACCT_CODE"));
cctrCode=checkNull(rs.getString("CCTR_CODE")); cctrCode = checkNull(rs.getString("CCTR_CODE"));
amountDet=rs.getDouble("AMOUNT"); amountDet = rs.getDouble("AMOUNT");
adCode=rs.getString("AD_CODE"); adCode = rs.getString("AD_CODE");
// xmlBuff.append("<Detail2 dbID='' domID='" + lineNo + "' objName=\"payr_voucher\" objContext=\"2\">"); // xmlBuff.append("<Detail2 dbID='' domID='" + lineNo + "' objName=\"payr_voucher\" objContext=\"2\">");
...@@ -694,18 +838,18 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -694,18 +838,18 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
int payrVouchDetInsert = pstmt1.executeUpdate(); int payrVouchDetInsert = pstmt1.executeUpdate();
System.out.println("@V@ row insert into payr_vouchdet " + payrVouchDetInsert); System.out.println("@V@ row insert into payr_vouchdet " + payrVouchDetInsert);
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1 = null;
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
if("Y".equalsIgnoreCase(autoPost)) if("Y".equalsIgnoreCase(autoPost))
{ {
//Commented by sarita to remove lookup for PayrollVoucherConf and use object instead on 20 JULY 18. payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
//payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
retString = checkNull(payrollVoucherConf.confirm(newVouchNo, forcedFlag, xtraParams, conn)); retString = checkNull(payrollVoucherConf.confirm(newVouchNo, forcedFlag, xtraParams, conn));
} }
//Changed By Santosh Gupta purposed to retrive old data of employee (10/4/17) //Changed By Santosh Gupta purposed to retrive old data of employee (10/4/17)
...@@ -718,47 +862,67 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -718,47 +862,67 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
{ {
errString=retString; errString=retString;
} }
// } // }
// else // else
// { // {
// errString=retString; // errString=retString;
// } // }
} // REVERSE Voucher END. } // REVERSE Voucher END.
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[Start]
tempEmpFname = tempEmpFname.length() > 15 ? tempEmpFname.substring(0, 15) : tempEmpFname;
tempEmpMname = tempEmpMname.length() > 15 ? tempEmpMname.substring(0, 15) : tempEmpMname;
tempEmpLname = tempEmpLname.length() > 15 ? tempEmpLname.substring(0, 15) : tempEmpLname;
System.out.println("@V@ tempEmpFname--["+tempEmpFname+"]");
System.out.println("@V@ tempEmpMname--["+tempEmpMname+"]");
System.out.println("@V@ tempEmpLname--["+tempEmpLname+"]");
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[End]
/** /**
* CHECK NO ERROR in REVERCE VOUCHER * CHECK NO ERROR in REVERCE VOUCHER
* */ * */
if(errString==null || errString.trim().length()==0) if(errString == null || errString.trim().length() == 0)
{ {
if("Y".equalsIgnoreCase(confirmStatus)) if("Y".equalsIgnoreCase(confirmStatus))
{ {
if(empFname.equalsIgnoreCase(tempEmpFname) && empMname.equalsIgnoreCase(tempEmpMname) if(empFname.equalsIgnoreCase(tempEmpFname) && empMname.equalsIgnoreCase(tempEmpMname)
&& empLname.equalsIgnoreCase(tempEmpLname) && empShortName.equalsIgnoreCase(tempEmpShortName)) && empLname.equalsIgnoreCase(tempEmpLname) && empShortName.equalsIgnoreCase(tempEmpShortName))
{ {
/** /**
* Update Employee details * Update Employee details
* */ * */
sql = "UPDATE EMPLOYEE SET M_STATUS = ?, M_STATUS_DATE = ?, NAME_PREFIX = ?, EMP_FNAME = ?, " + //Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]
/*sql = "UPDATE EMPLOYEE SET M_STATUS = ?, M_STATUS_DATE = ?, NAME_PREFIX = ?, EMP_FNAME = ?, " +
"EMP_MNAME = ?, EMP_LNAME = ?, SHORT_NAME = ?, CHG_USER = ?, CHG_DATE = ?, CHG_TERM = ? " + "EMP_MNAME = ?, EMP_LNAME = ?, SHORT_NAME = ?, CHG_USER = ?, CHG_DATE = ?, CHG_TERM = ? " +
"WHERE EMP_CODE = ?";*/
sql = "UPDATE EMPLOYEE SET M_STATUS = ?, M_STATUS_DATE = ?, NAME_PREFIX = ?, EMP_FNAME = ?, " +
"EMP_MNAME = ?, EMP_LNAME = ?, SHORT_NAME = ?, CHG_USER = ?, CHG_DATE = ?, CHG_TERM = ?, EMP_FNAME_LONG = ?, EMP_MNAME_LONG = ?, EMP_LNAME_LONG = ? " +
"WHERE EMP_CODE = ?"; "WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, oldStatus); pstmt.setString(1, oldStatus);
// pstmt.setTimestamp(2, statusDateTimeStamp); // pstmt.setTimestamp(2, statusDateTimeStamp);
pstmt.setTimestamp(2, prvStatDtTimestamp); pstmt.setTimestamp(2, prvStatDtTimestamp);
pstmt.setString(3, namePrefix); pstmt.setString(3, namePrefix);
pstmt.setString(4, empFName); //Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[Start]
/*pstmt.setString(4, empFName);
pstmt.setString(5, empMName); pstmt.setString(5, empMName);
pstmt.setString(6, empLName); pstmt.setString(6, empLName);*/
pstmt.setString(4, empFName.length() > 15 ? empFName.substring(0, 15) : empFName);
pstmt.setString(5, empMName.length() > 15 ? empMName.substring(0, 15) : empMName);
pstmt.setString(6, empLName.length() > 15 ? empLName.substring(0, 15) : empLName);
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[End]
pstmt.setString(7, shortName); pstmt.setString(7, shortName);
pstmt.setString(8, chgUser); pstmt.setString(8, chgUser);
pstmt.setTimestamp(9, chgDate); pstmt.setTimestamp(9, chgDate);
pstmt.setString(10, chgTerm); pstmt.setString(10, chgTerm);
pstmt.setString(11, empCode); //Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[Start]
//pstmt.setString(11, empCode);
pstmt.setString(11, empFName);
pstmt.setString(12, empMName);
pstmt.setString(13, empLName);
pstmt.setString(14, empCode);
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[End]
updateEmployeeCount = pstmt.executeUpdate(); updateEmployeeCount = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt = null;
System.out.println("@V@ UpdateEmployee :- [" + updateEmployeeCount+"]"); System.out.println("@V@ UpdateEmployee :- [" + updateEmployeeCount+"]");
} }
...@@ -778,7 +942,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -778,7 +942,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
pstmt.setString(7, empCode); pstmt.setString(7, empCode);
updateEmployeeCount = pstmt.executeUpdate(); updateEmployeeCount = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt = null;
System.out.println("@V@ Name not matcching UpdateEmployee :- [" + updateEmployeeCount+"]"); System.out.println("@V@ Name not matcching UpdateEmployee :- [" + updateEmployeeCount+"]");
} }
...@@ -787,7 +951,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -787,7 +951,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
{ {
System.out.println("@V@ Un confirm transaction NOT update Employee"); System.out.println("@V@ Un confirm transaction NOT update Employee");
} }
/** /**
* Update EMP_MARITALCHG * Update EMP_MARITALCHG
* set CONFIRMED= 'X', CONF_DATE, REVS_VOUCHER_NO * set CONFIRMED= 'X', CONF_DATE, REVS_VOUCHER_NO
...@@ -802,38 +965,47 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -802,38 +965,47 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
pstmt.setTimestamp(4, tranDateTimestamp); pstmt.setTimestamp(4, tranDateTimestamp);
updateMaritalChgCount = pstmt.executeUpdate(); updateMaritalChgCount = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt = null;
System.out.println("@V@ UpdateMaritalChg :- [" + updateMaritalChgCount+"]"); System.out.println("@V@ UpdateMaritalChg :- [" + updateMaritalChgCount+"]");
if(updateMaritalChgCount>0) if(updateMaritalChgCount > 0)
{ {
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VTCANSUCSS", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VTCANSUCSS", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTCANSUCSS", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
} }
} // NO ERROR in REVERCE VOUCHER } // NO ERROR in REVERCE VOUCHER
} // NO ERROR BEFORE EXECUTION. } // NO ERROR BEFORE EXECUTION.
} }
catch (SQLException e) catch (SQLException e)
{ {
e.printStackTrace(); e.printStackTrace();
//modified by Shital on 12/08/2019 [Start]
throw new ITMException(e);
//modified by Shital on 12/08/2019 [End]
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
//modified by Shital on 12/08/2019 [Start]
throw new ITMException(e);
//modified by Shital on 12/08/2019 [End]
} }
finally finally
{ {
try try
{ {
//Added by sarita on 25 JULY 18 [START] if (rs != null)
itmDBAccessEJB = null; {
//Added by sarita on 25 JULY 18 [END] rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(!conn.isClosed()) if(!conn.isClosed())
{ {
if(updateMaritalChgCount>0) if(updateMaritalChgCount > 0)
{ {
conn.commit(); conn.commit();
} }
...@@ -843,16 +1015,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -843,16 +1015,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
} }
conn.close(); conn.close();
} }
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -861,50 +1023,58 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -861,50 +1023,58 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
throw new ITMException(e); throw new ITMException(e);
} }
} }
return errString; return errString;
} }
private String getAutoPostValue(String empCode, String varName, Connection conn) throws ITMException private String getAutoPostValue(String empCode, String varName, Connection conn) throws ITMException
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
String autoPost="",sql=""; String autoPost = "";
PreparedStatement pstmt=null; String sql = "";
ResultSet rs=null; PreparedStatement pstmt = null;
ResultSet rs = null;
try { try
sql="select ddf_hr_site_env_value(?,SYSDATE,?)as var_value from dual"; {
pstmt=conn.prepareStatement(sql); sql = "select ddf_hr_site_env_value(?,SYSDATE,?)as var_value from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setString(2, varName); pstmt.setString(2, varName);
rs=pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
autoPost=rs.getString("var_value"); autoPost = rs.getString("var_value");
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
} catch (SQLException e) { close( pstmt, rs);
}
catch (SQLException e)
{
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
{ {
try { try
if(pstmt!=null) {
if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
pstmt=null; pstmt = null;
} }
if(rs!=null) if(rs != null)
{ {
rs.close(); rs.close();
rs=null; rs = null;
}
} }
} catch (SQLException e) { catch (SQLException e)
{
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
...@@ -938,10 +1108,12 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -938,10 +1108,12 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
tranSer = rs.getString("REF_SER"); tranSer = rs.getString("REF_SER");
} }
// close(pstmt, rs); // close(pstmt, rs);
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
close( pstmt, rs);
System.out.println("keyString :"+keyString); System.out.println("keyString :"+keyString);
System.out.println("keyCol :"+keyCol); System.out.println("keyCol :"+keyCol);
...@@ -994,15 +1166,102 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -994,15 +1166,102 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
} }
return tranId; return tranId;
} }
/*Start:Added by vinay 13/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
private String generateTranIdForPayrollVoucherCancel(String windowName,String siteCode,String paySite,String workSite,String empSite,String tranDateStr,Connection conn) throws ITMException
{
System.out.println("@vinay::called from generateTranIdForPayrollVoucherCancel");
PreparedStatement pstmt = null;
ResultSet rs = null;
String selSql = "";
String tranId = "";
String tranSer = "";
String keyString = "";
String keyCol = "";
String xmlValues = "";
try
{
System.out.println("generateTranId() called...");
selSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
pstmt = conn.prepareStatement(selSql);
pstmt.setString( 1, windowName );
rs = pstmt.executeQuery();
if (rs.next())
{
keyString = rs.getString("KEY_STRING");
keyCol = rs.getString("TRAN_ID_COL");
tranSer = rs.getString("REF_SER");
}
close(pstmt, rs);
System.out.println("@vinay::keyString :"+keyString);
System.out.println("@vinay::keyCol :"+keyCol);
System.out.println("@vinay::tranSer :"+tranSer);
System.out.println("@vinay::paySite :"+paySite);
System.out.println("@vinay::workSite :"+workSite);
System.out.println("@vinay::empSite :"+empSite);
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>";
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
xmlValues = xmlValues + "<pay_site>" + paySite + "</pay_site>";
xmlValues = xmlValues + "<work_site>" + workSite + "</work_site>";
xmlValues = xmlValues + "<emp_site>" + empSite + "</emp_site>";
xmlValues = xmlValues + "<tran_date>" + tranDateStr + "</tran_date>";
xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]");
TransIDGenerator transIDGenerator = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
tranId = transIDGenerator.generateTranSeqID(tranSer, keyCol, keyString, conn);
System.out.println("tranId :"+tranId);
}
catch (SQLException ex)
{
System.out.println("Exception :EmpMaritalStatusConf :generateTranId :SQLException ::" +selSql+ ex.getMessage() + ":");
ex.printStackTrace();
throw new ITMException(ex);
}
catch (Exception e)
{
System.out.println("Exception :EmpMaritalStatusConf :generateTranId :Exception ::" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
}
return tranId;
}
/*end: Added by vinay 13/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
private String errorType(Connection conn, String errorCode) throws ITMException private String errorType(Connection conn, String errorCode) throws ITMException
{ {
String msgType = ""; String msgType = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "";
try try
{ {
String sql = " SELECT MSG_TYPE FROM MESSAGES WHERE MSG_NO = ? "; sql = " SELECT MSG_TYPE FROM MESSAGES WHERE MSG_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, errorCode); pstmt.setString(1, errorCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1040,8 +1299,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -1040,8 +1299,6 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
return msgType; return msgType;
} }
private String checkNull(String input) private String checkNull(String input)
{ {
if (input == null || ("null").equalsIgnoreCase(input.trim())) if (input == null || ("null").equalsIgnoreCase(input.trim()))
...@@ -1063,4 +1320,29 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -1063,4 +1320,29 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
} }
return input; return input;
} }
// Added by Sanket on 08/MAR/2018[Closing result set and prepared stmt][Start]
private void close(PreparedStatement pstmt, ResultSet rs) throws ITMException
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch (Exception ex)
{
ex.printStackTrace();
//modified by Shital on 12/08/2019 [Start]
throw new ITMException(ex);
//modified by Shital on 12/08/2019 [End]
}
}
// Added by Sanket on 08/MAR/2018[Closing result set and prepared stmt][END]
} }
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
package ibase.webitm.ejb.adm.adv; package ibase.webitm.ejb.adm.adv;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.system.config.ConnDriver; //modified by Shital on 12/08/2019 [Start]
//import ibase.system.config.ConnDriver;
//modified by Shital on 12/08/2019 [End]
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;
//Added and Commented by sarita on 20 JULY 18 [START]
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
//import ibase.webitm.ejb.ITMDBAccessLocal; import ibase.webitm.ejb.ITMDBAccessLocal;
//Added and Commented by sarita on 20 JULY 18 [END]
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.adm.AdmCommon; import ibase.webitm.ejb.adm.AdmCommon;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -28,8 +28,9 @@ import java.sql.Timestamp; ...@@ -28,8 +28,9 @@ import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
//modified by Shital on 12/08/2019 [Start]
import javax.ejb.Stateless; //import javax.ejb.Stateless;
//modified by Shital on 12/08/2019 [End]
import javax.naming.InitialContext; import javax.naming.InitialContext;
import org.w3c.dom.Document; import org.w3c.dom.Document;
...@@ -37,7 +38,9 @@ import org.w3c.dom.Document; ...@@ -37,7 +38,9 @@ import org.w3c.dom.Document;
/** /**
* Session Bean implementation class EmpMaritalStatusConf * Session Bean implementation class EmpMaritalStatusConf
*/ */
@Stateless //modified by Shital on 12/08/2019 [Start]
//@Stateless
//modified by Shital on 12/08/2019 [End]
public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMaritalStatusConfRemote, EmpMaritalStatusConfLocal public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMaritalStatusConfRemote, EmpMaritalStatusConfLocal
{ {
public String actionHandler() throws RemoteException, ITMException public String actionHandler() throws RemoteException, ITMException
...@@ -48,14 +51,20 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -48,14 +51,20 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
public String actionHandler(String tranId, String xtraParams, String forcedFlag) throws RemoteException, ITMException public String actionHandler(String tranId, String xtraParams, String forcedFlag) throws RemoteException, ITMException
{ {
Connection connection = null; Connection connection = null;
ConnDriver connDriver = null; //modified by Shital on 12/08/2019 [Start]
//ConnDriver connDriver = null;
//modified by Shital on 12/08/2019 [End]
String retString = ""; String retString = "";
boolean isError = false; boolean isError = false;
try try
{ {
connDriver = new ConnDriver(); //modified by Shital on 12/08/2019 [Start]
connection = connDriver.getConnectDB("DriverITM"); //connDriver = new ConnDriver();
//connection = connDriver.getConnectDB("DriverITM");
connection = getConnection();
connection.setAutoCommit(false); connection.setAutoCommit(false);
//modified by Shital on 12/08/2019 [End]
retString = checkNull(actionHandler(tranId, xtraParams, forcedFlag, connection)); retString = checkNull(actionHandler(tranId, xtraParams, forcedFlag, connection));
} }
catch(Exception e) catch(Exception e)
...@@ -115,15 +124,25 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -115,15 +124,25 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
ResultSet rs = null; ResultSet rs = null;
AppConnectParm appConnect = null; AppConnectParm appConnect = null;
InitialContext initialCtx = null; InitialContext initialCtx = null;
//Added & Commented by sarita to use object of ITMDBAccessEJB instead ITMDBAccessLocal on 20 JULY 18.[START] ITMDBAccessLocal itmDBAccess = null;
//ITMDBAccessLocal itmDBAccess = null;
ITMDBAccessEJB itmDBAccess = null;
//Added & Commented by sarita to use object of ITMDBAccessEJB instead ITMDBAccessLocal on 20 JULY 18.[END]
ValidatorEJB validator = null; ValidatorEJB validator = null;
String empCode = "", tranDate = "", statusDate = "", oldStatus = "", newStatus = "", amount = "", generateVouch = ""; String empCode = "";
E12GenericUtility genericUtility = null; String tranDate = "";
String statusDate = "";
String oldStatus = "";
String newStatus = "";
String amount = "";
String generateVouch = "";
E12GenericUtility genericUtility = new E12GenericUtility();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
String sql = ""; String sql = "";
String loginEmpCode = "", shortName = "", empFName = "", empMName = "", empLName = "", loginCode = "", chgTerm = ""; String loginEmpCode = "";
String shortName = "";
String empFName = "";
String empMName = "";
String empLName = "";
String loginCode = "";
String chgTerm = "";
Timestamp statusDateTimeStamp = null; Timestamp statusDateTimeStamp = null;
Timestamp tranDateTimestamp = null; Timestamp tranDateTimestamp = null;
String entryBatchNo = " ", tranType = "", bankCode = "", autoPay = "", payMode = "", autoPost = "", holdFlag = "", giftCode = ""; String entryBatchNo = " ", tranType = "", bankCode = "", autoPay = "", payMode = "", autoPost = "", holdFlag = "", giftCode = "";
...@@ -131,32 +150,57 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -131,32 +150,57 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
String acctCodeSal = "", cctrCodeSal = "", finEntity = "", empCctrCodeSal = "", empDeptCode = ""; String acctCodeSal = "", cctrCodeSal = "", finEntity = "", empCctrCodeSal = "", empDeptCode = "";
String empBankCode = "", prdCode = "", currencyCode = "", acctCodePay = "", cctrCodePay = "", vouchType = ""; String empBankCode = "", prdCode = "", currencyCode = "", acctCodePay = "", cctrCodePay = "", vouchType = "";
String confirmed = "", paid = "", remarks = "", confirmStatus = ""; String confirmed = "", paid = "", remarks = "", confirmStatus = "";
double totalAmount = 0.0d, exchangeRate = 0.0d, totalAmountBC = 0.0d; double totalAmount = 0.0d;
double exchangeRate = 0.0d;
double totalAmountBC = 0.0d;
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
Date relieveDate = null; Date relieveDate = null;
//Added & Commented by sarita to create object of PayrollVoucherConf instead PayrollVoucherConfLocal on 20 JULY 18.[START] PayrollVoucherConfLocal payrollVoucherConf = null;
//PayrollVoucherConfLocal payrollVoucherConf = null;
PayrollVoucherConf payrollVoucherConf = new PayrollVoucherConf();
//Added & Commented by sarita to create object of PayrollVoucherConf instead PayrollVoucherConfLocal on 20 JULY 18.[START]
/* Added by vinay 07/03/2019 */
String empPaySite = "";
String empWorkSite = "";
String empSite = "";
/* Added by vinay 07/03/2019 */
try try
{ {
genericUtility = new E12GenericUtility(); //modified by Shital on 12/08/2019 [Start]
//Added & Commented by sarita to create object instead creating lookup for ITMDBAccessEJB on 20 JULY 18 [START] /*genericUtility = new E12GenericUtility();
/*appConnect = new AppConnectParm(); appConnect = new AppConnectParm();
initialCtx = new InitialContext(appConnect.getProperty()); initialCtx = new InitialContext(appConnect.getProperty());*/
itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");*/ /*itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");*/
itmDBAccess = new ITMDBAccessEJB(); //modified by Shital on 12/08/2019 [End]
//Added & Commented by sarita to create object instead creating lookup for ITMDBAccessEJB on 20 JULY 18 [END]
loginEmpCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode")); loginEmpCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")); loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId")); chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
empCode = checkNull(genericUtility.getColumnValue("emp_code", headerDom)); System.out.println("Header DOM :: " + genericUtility.serializeDom(headerDom));
System.out.println("Detail DOM :: " + genericUtility.serializeDom(detailDom));
//Commented and added by shital 13 AUG 2019 [START]
/*empCode = checkNull(genericUtility.getColumnValue("emp_code", headerDom));
tranDate = checkNull(genericUtility.getColumnValue("tran_date", headerDom)); tranDate = checkNull(genericUtility.getColumnValue("tran_date", headerDom));
statusDate = checkNull(genericUtility.getColumnValue("status_date", headerDom)); statusDate = checkNull(genericUtility.getColumnValue("status_date", headerDom));
oldStatus = checkNull(genericUtility.getColumnValue("old_status", headerDom)); oldStatus = checkNull(genericUtility.getColumnValue("old_status", headerDom));
generateVouch = checkNull(genericUtility.getColumnValue("generate_voucher", headerDom)); generateVouch = checkNull(genericUtility.getColumnValue("generate_voucher", headerDom));*/
sql = "select emp_code , "
+ "tran_date , "
+ "status_date , "
+ "old_status , "
+ "generate_voucher "
+ "from "
+ "EMP_MARITALCHG where tran_id = ?";
pstmt = connection.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
empCode = rs.getString("emp_code");
tranDate = rs.getString("tran_date");
statusDate = rs.getString("status_date");
oldStatus = rs.getString("old_status");
generateVouch = rs.getString("generate_voucher");
}
//Commented and added by shital 13 AUG 2019 [END]
System.out.println("empCode ::" + empCode); System.out.println("empCode ::" + empCode);
System.out.println("tranDate ::" + tranDate); System.out.println("tranDate ::" + tranDate);
System.out.println("statusDate ::" + statusDate); System.out.println("statusDate ::" + statusDate);
...@@ -208,11 +252,12 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -208,11 +252,12 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
if("Y".equalsIgnoreCase(confirmStatus)) if("Y".equalsIgnoreCase(confirmStatus))
{ {
retString = itmDBAccess.getErrorString("", "VTMARSCH01", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VTMARSCH01", "", "", connection);
return retString; return retString;
} }
String namePrefix = "", sex = ""; String namePrefix = "";
String sex = "";
sql = "SELECT NAME_PREFIX, SEX FROM EMPLOYEE WHERE EMP_CODE = ? "; sql = "SELECT NAME_PREFIX, SEX FROM EMPLOYEE WHERE EMP_CODE = ? ";
pstmt = connection.prepareStatement(sql); pstmt = connection.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
...@@ -228,21 +273,35 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -228,21 +273,35 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
{ {
namePrefix = "Ms"; namePrefix = "Ms";
} }
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]
sql = "UPDATE EMPLOYEE SET M_STATUS = ?, M_STATUS_DATE = ?, NAME_PREFIX = ?, EMP_FNAME = ?, " + /*sql = "UPDATE EMPLOYEE SET M_STATUS = ?, M_STATUS_DATE = ?, NAME_PREFIX = ?, EMP_FNAME = ?, " +
"EMP_MNAME = ?, EMP_LNAME = ?, SHORT_NAME = ?, CHG_USER = ?, CHG_DATE = FN_SYSDATE(), CHG_TERM = ? " + "EMP_MNAME = ?, EMP_LNAME = ?, SHORT_NAME = ?, CHG_USER = ?, CHG_DATE = FN_SYSDATE(), CHG_TERM = ? " +
"WHERE EMP_CODE = ?";*/
sql = "UPDATE EMPLOYEE SET M_STATUS = ?, M_STATUS_DATE = ?, NAME_PREFIX = ?, EMP_FNAME = ?, " +
"EMP_MNAME = ?, EMP_LNAME = ?, SHORT_NAME = ?, CHG_USER = ?, CHG_DATE = FN_SYSDATE(), CHG_TERM = ?,EMP_FNAME_LONG = ?,EMP_MNAME_LONG = ?, EMP_LNAME_LONG = ? " +
"WHERE EMP_CODE = ?"; "WHERE EMP_CODE = ?";
pstmt = connection.prepareStatement(sql); pstmt = connection.prepareStatement(sql);
pstmt.setString(1, newStatus); pstmt.setString(1, newStatus);
pstmt.setTimestamp(2, statusDateTimeStamp); pstmt.setTimestamp(2, statusDateTimeStamp);
pstmt.setString(3, namePrefix); pstmt.setString(3, namePrefix);
pstmt.setString(4, empFName); //Changed By Sanket J on 01/March/18 for [new column to handle long value employee names][Start]
/*pstmt.setString(4, empFName);
pstmt.setString(5, empMName); pstmt.setString(5, empMName);
pstmt.setString(6, empLName); pstmt.setString(6, empLName);*/
pstmt.setString(4, empFName.length() > 15 ? empFName.substring(0, 15) : empFName);
pstmt.setString(5, empMName.length() > 15 ? empMName.substring(0, 15) : empMName);
pstmt.setString(6, empLName.length() > 15 ? empLName.substring(0, 15) : empLName);
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[End]
pstmt.setString(7, shortName); pstmt.setString(7, shortName);
pstmt.setString(8, loginCode); pstmt.setString(8, loginCode);
pstmt.setString(9, chgTerm); pstmt.setString(9, chgTerm);
pstmt.setString(10, empCode); //Changed By Sanket J on 01/March/18 for [new column to handle long value employee names][Start]
//pstmt.setString(10, empCode);
pstmt.setString(10, empFName);
pstmt.setString(11, empMName);
pstmt.setString(12, empLName);
pstmt.setString(13, empCode);
//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names][End
int updateEmployeeCount = pstmt.executeUpdate(); int updateEmployeeCount = pstmt.executeUpdate();
System.out.println("updateEmployee :: " + updateEmployeeCount); System.out.println("updateEmployee :: " + updateEmployeeCount);
close(pstmt, rs); close(pstmt, rs);
...@@ -258,7 +317,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -258,7 +317,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
if(updateEmployeeCount == 0 || updateMaritalChgCount == 0) if(updateEmployeeCount == 0 || updateMaritalChgCount == 0)
{ {
retString = itmDBAccess.getErrorString("","VTMARSCH02","","",connection); retString = itmDBAccessEJB.getErrorString("","VTMARSCH02","","",connection);
return retString; return retString;
} }
...@@ -279,32 +338,32 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -279,32 +338,32 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
bankCode = checkNull(admCommon.getEnv("999999","BANKCODE",connection)); bankCode = checkNull(admCommon.getEnv("999999","BANKCODE",connection));
if("NULLFOUND".equalsIgnoreCase(bankCode)) if("NULLFOUND".equalsIgnoreCase(bankCode))
{ {
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", connection);
return retString; return retString;
} }
autoPay = checkNull(admCommon.getEnv("999999", "AUTO_PAY", connection)); autoPay = checkNull(admCommon.getEnv("999999", "AUTO_PAY", connection));
if("NULLFOUND".equalsIgnoreCase(autoPay)) if("NULLFOUND".equalsIgnoreCase(autoPay))
{ {
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", connection);
return retString; return retString;
} }
payMode = checkNull(admCommon.getEnv("999999", "PAY_MODE", connection)); payMode = checkNull(admCommon.getEnv("999999", "PAY_MODE", connection));
if("NULLFOUND".equalsIgnoreCase(payMode)) if("NULLFOUND".equalsIgnoreCase(payMode))
{ {
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", connection);
return retString; return retString;
} }
// autoPost = checkNull(admCommon.getEnv("999999", "AUTO_POST", connection)); // autoPost = checkNull(admCommon.getEnv("999999", "AUTO_POST", connection));
autoPost=getAutoPostValue(empCode,"AUTO_POST",connection); autoPost = getAutoPostValue(empCode,"AUTO_POST",connection);
if("NULLFOUND".equalsIgnoreCase(autoPost)) if("NULLFOUND".equalsIgnoreCase(autoPost))
{ {
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", connection);
return retString; return retString;
} }
giftCode = (admCommon.getEnv("999999", "GIFT_CODE", connection)); giftCode = (admCommon.getEnv("999999", "GIFT_CODE", connection));
if("NULLFOUND".equalsIgnoreCase(giftCode)) if("NULLFOUND".equalsIgnoreCase(giftCode))
{ {
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", connection);
return retString; return retString;
} }
...@@ -333,29 +392,24 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -333,29 +392,24 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
holdFlag = checkNull(admCommon.getEnv("999999","HOLD_FLAG",connection)); holdFlag = checkNull(admCommon.getEnv("999999","HOLD_FLAG",connection));
if("NULLFOUND".equalsIgnoreCase(holdFlag)) if("NULLFOUND".equalsIgnoreCase(holdFlag))
{ {
retString = itmDBAccess.getErrorString("","VSENVAR1","","",connection); retString = itmDBAccessEJB.getErrorString("","VSENVAR1","","",connection);
return retString; return retString;
} }
} }
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = validator.nfCheckPeriod("ADM", tranDateSql, paySite);
errCode = validator.nfCheckPeriod("ADM", tranDateSql, paySite,connection); errCode = validator.nfCheckPeriod("ADM", tranDateSql, paySite,connection);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode == null || errCode.trim().length() == 0) if(errCode == null || errCode.trim().length() == 0)
{ {
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = validator.nfCheckPeriod("FIN", tranDateSql, paySite);
errCode = validator.nfCheckPeriod("FIN", tranDateSql, paySite,connection); errCode = validator.nfCheckPeriod("FIN", tranDateSql, paySite,connection);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode != null && errCode.trim().length() > 0) if(errCode != null && errCode.trim().length() > 0)
{ {
retString = itmDBAccess.getErrorString("", errCode, "", "", connection); retString = itmDBAccessEJB.getErrorString("", errCode, "", "", connection);
return retString; return retString;
} }
} }
else else
{ {
retString = itmDBAccess.getErrorString("", errCode, "", "", connection); retString = itmDBAccessEJB.getErrorString("", errCode, "", "", connection);
return retString; return retString;
} }
...@@ -383,7 +437,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -383,7 +437,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
if(totalAmount == 0) if(totalAmount == 0)
{ {
retString = itmDBAccess.getErrorString("", "VTVCHAMT0", "", "", connection); retString = itmDBAccessEJB.getErrorString("", "VTVCHAMT0", "", "", connection);
return retString; return retString;
} }
...@@ -429,24 +483,62 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -429,24 +483,62 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
acctCodePay = rs.getString("ACCT_CODE"); //modified by Shital on 12/08/2019 [Start]
cctrCodePay = rs.getString("CCTR_CODE"); //acctCodePay = rs.getString("ACCT_CODE");
//cctrCodePay = rs.getString("CCTR_CODE");
acctCodePay = checkNull(rs.getString("ACCT_CODE"));
cctrCodePay = checkNull(rs.getString("CCTR_CODE"));
//modified by Shital on 12/08/2019 [End]
} }
close(pstmt, rs); close(pstmt, rs);
/* Start:Added by vinay 07/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
sql="SELECT PAY_SITE,WORK_SITE,EMP_SITE FROM EMPLOYEE where emp_code=?";
pstmt = connection.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
//modified by Shital on 12/08/2019 [Start]
//empPaySite=rs.getString("PAY_SITE");
//empWorkSite=rs.getString("WORK_SITE");
//empSite=rs.getString("EMP_SITE");
empPaySite = checkNull(rs.getString("PAY_SITE"));
empWorkSite = checkNull(rs.getString("WORK_SITE"));
empSite = checkNull(rs.getString("EMP_SITE"));
//modified by Shital on 12/08/2019 [End]
}
close(pstmt, rs);
System.out.println("@vinay::actionHandler::empPaySite>>"+empPaySite);
System.out.println("@vinay::actionHandler::empWorkSite>>"+empWorkSite);
System.out.println("@vinay::actionHandler::empSite>>"+empSite);
/* End:Added by vinay 07/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
/* Commented by vinay 07/03/2019
tranId = generateTranId(winName, siteCodeAcct, tranDate, connection); tranId = generateTranId(winName, siteCodeAcct, tranDate, connection);
System.out.println("tranId generated :: "+tranId); */
/* Added by vinay 07/03/2019 */
tranId = generateTranIdForPayrollVoucher(winName,siteCodeAcct,empPaySite,empWorkSite,empSite,tranDate,connection);
/* Ended by vinay 07/03/2019 */
System.out.println("@vinay::tranId generated :: "+tranId);
totalAmountBC = totalAmount * exchangeRate; totalAmountBC = totalAmount * exchangeRate;
String adCode = ""; String adCode = "";
//Modified by Santosh Gupta START //Modified by Santosh Gupta START
String refId=""; String refId = "";
if(statusDate==null || statusDate.trim().length()==0) if(statusDate == null || statusDate.trim().length() == 0)
{ {
refId=tranId; refId = tranId;
System.out.println("refId is:"+refId); System.out.println("refId is:"+refId);
}else{ }
refId=statusDate; else
{
refId = statusDate;
System.out.println("refId is:"+refId); System.out.println("refId is:"+refId);
} }
// Santosh Gupta END // Santosh Gupta END
...@@ -454,7 +546,6 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -454,7 +546,6 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDateStr = sdf1.format(currentDate.getTime()); String sysDateStr = sdf1.format(currentDate.getTime());
sql = " INSERT INTO PAYR_VOUCHER (TRAN_ID, TRAN_DATE, TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " + sql = " INSERT INTO PAYR_VOUCHER (TRAN_ID, TRAN_DATE, TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " +
"BANK_CODE, AUTO_PAY, PAY_MODE, CHG_DATE, CHG_USER, CHG_TERM, SITE_CODE, FIN_ENTITY, REMARKS, " + "BANK_CODE, AUTO_PAY, PAY_MODE, CHG_DATE, CHG_USER, CHG_TERM, SITE_CODE, FIN_ENTITY, REMARKS, " +
"ANAL_CODE, CONFIRMED, PAID, ACCT_CODE__PAY, CCTR_CODE__PAY, TOT_AMT, ENTRY_BATCH_NO, VOUCH_TYPE, " + "ANAL_CODE, CONFIRMED, PAID, ACCT_CODE__PAY, CCTR_CODE__PAY, TOT_AMT, ENTRY_BATCH_NO, VOUCH_TYPE, " +
...@@ -500,8 +591,12 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -500,8 +591,12 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
acctCodeSal = rs.getString("ACCT_CODE__SAL"); //modified by Shital on 12/08/2019 [Start]
cctrCodeSal = rs.getString("CCTR_CODE__SAL"); //acctCodeSal = rs.getString("ACCT_CODE__SAL");
//cctrCodeSal = rs.getString("CCTR_CODE__SAL");
acctCodeSal = checkNull(rs.getString("ACCT_CODE__SAL"));
cctrCodeSal = checkNull(rs.getString("CCTR_CODE__SAL"));
//modified by Shital on 12/08/2019 [End]
} }
close(pstmt, rs); close(pstmt, rs);
...@@ -537,8 +632,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -537,8 +632,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
if("Y".equalsIgnoreCase(autoPost)) if("Y".equalsIgnoreCase(autoPost))
{ {
//Commented by sarita to remove lookup for PayrollVoucherConf and use object instead on 20 JULY 18 payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
//payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
retString = checkNull(payrollVoucherConf.confirm(tranId, forcedFlag, xtraParams, connection)); retString = checkNull(payrollVoucherConf.confirm(tranId, forcedFlag, xtraParams, connection));
if(retString.length() > 0 && retString.indexOf("VTMCONF2") == -1 ) if(retString.length() > 0 && retString.indexOf("VTMCONF2") == -1 )
{ {
...@@ -557,7 +651,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -557,7 +651,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
close(pstmt, rs); close(pstmt, rs);
if(!"Y".equalsIgnoreCase(confirmed)) if(!"Y".equalsIgnoreCase(confirmed))
{ {
retString = itmDBAccess.getErrorString("","PAYVCHCNF1","","",connection); retString = itmDBAccessEJB.getErrorString("","PAYVCHCNF1","","",connection);
return retString; return retString;
} }
} }
...@@ -572,9 +666,6 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -572,9 +666,6 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
} }
finally finally
{ {
//Added by sarita on 25 JULY 18 [START]
itmDBAccess = null;
//Added by sarita on 25 JULY 18 [END]
close(pstmt, rs); close(pstmt, rs);
} }
return retString; return retString;
...@@ -582,32 +673,42 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -582,32 +673,42 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
private String getAutoPostValue(String empCode, String varName, Connection conn) throws ITMException private String getAutoPostValue(String empCode, String varName, Connection conn) throws ITMException
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
String autoPost="",sql=""; String autoPost="";
PreparedStatement pstmt=null; String sql="";
ResultSet rs=null; PreparedStatement pstmt = null;
ResultSet rs = null;
try { try
sql="select ddf_hr_site_env_value(?,SYSDATE,?)as var_value from dual"; {
pstmt=conn.prepareStatement(sql); sql = "select ddf_hr_site_env_value(?,SYSDATE,?)as var_value from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setString(2, varName); pstmt.setString(2, varName);
rs=pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
autoPost=rs.getString("var_value"); //modified by Shital on 12/08/2019 [Start]
//autoPost=rs.getString("var_value");
autoPost = checkNull(rs.getString("var_value"));
//modified by Shital on 12/08/2019 [End]
} }
pstmt.close(); //Changed By sanket on 08/MAR/18 [for proper closing connection]
/*pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;*/
} catch (SQLException e) { close( pstmt, rs);
}
catch (SQLException e)
{
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
{ {
try { try
{
if(pstmt!=null) if(pstmt!=null)
{ {
pstmt.close(); pstmt.close();
...@@ -618,7 +719,9 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -618,7 +719,9 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
rs.close(); rs.close();
rs=null; rs=null;
} }
} catch (SQLException e) { }
catch (SQLException e)
{
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
...@@ -647,9 +750,14 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -647,9 +750,14 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
keyString = rs.getString("KEY_STRING"); //modified by Shital on 12/08/2019 [Start]
keyCol = rs.getString("TRAN_ID_COL"); //keyString = rs.getString("KEY_STRING");
tranSer = rs.getString("REF_SER"); //keyCol = rs.getString("TRAN_ID_COL");
//tranSer = rs.getString("REF_SER");
keyString = checkNull(rs.getString("KEY_STRING"));
keyCol = checkNull(rs.getString("TRAN_ID_COL"));
tranSer = checkNull(rs.getString("REF_SER"));
//modified by Shital on 12/08/2019 [End]
} }
close(pstmt, rs); close(pstmt, rs);
System.out.println("keyString :"+keyString); System.out.println("keyString :"+keyString);
...@@ -703,7 +811,98 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -703,7 +811,98 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
} }
return tranId; return tranId;
} }
/*Start:Added by vinay 07/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
private String generateTranIdForPayrollVoucher(String windowName,String siteCode,String paySite,String workSite,String empSite,String tranDateStr,Connection conn) throws ITMException
{
System.out.println("@vinay::called from generateTranIdForPayrollVoucher");
PreparedStatement pstmt = null;
ResultSet rs = null;
String selSql = "";
String tranId = "";
String tranSer = "";
String keyString = "";
String keyCol = "";
String xmlValues = "";
try
{
System.out.println("generateTranId() called...");
selSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
pstmt = conn.prepareStatement(selSql);
pstmt.setString( 1, windowName );
rs = pstmt.executeQuery();
if (rs.next())
{
//modified by Shital on 12/08/2019 [Start]
//keyString = rs.getString("KEY_STRING");
//keyCol = rs.getString("TRAN_ID_COL");
//tranSer = rs.getString("REF_SER");
keyString = checkNull(rs.getString("KEY_STRING"));
keyCol = checkNull(rs.getString("TRAN_ID_COL"));
tranSer = checkNull(rs.getString("REF_SER"));
//modified by Shital on 12/08/2019 [End]
}
close(pstmt, rs);
System.out.println("@vinay::keyString :"+keyString);
System.out.println("@vinay::keyCol :"+keyCol);
System.out.println("@vinay::tranSer :"+tranSer);
System.out.println("@vinay::paySite :"+paySite);
System.out.println("@vinay::workSite :"+workSite);
System.out.println("@vinay::empSite :"+empSite);
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>";
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
xmlValues = xmlValues + "<pay_site>" + paySite + "</pay_site>";
xmlValues = xmlValues + "<work_site>" + workSite + "</work_site>";
xmlValues = xmlValues + "<emp_site>" + empSite + "</emp_site>";
xmlValues = xmlValues + "<tran_date>" + tranDateStr + "</tran_date>";
xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]");
TransIDGenerator transIDGenerator = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
tranId = transIDGenerator.generateTranSeqID(tranSer, keyCol, keyString, conn);
System.out.println("tranId :"+tranId);
}
catch (SQLException ex)
{
System.out.println("Exception :EmpMaritalStatusConf :generateTranId :SQLException ::" +selSql+ ex.getMessage() + ":");
ex.printStackTrace();
throw new ITMException(ex);
}
catch (Exception e)
{
System.out.println("Exception :EmpMaritalStatusConf :generateTranId :Exception ::" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
}
return tranId;
}
/*end: Added by vinay 07/03/2019 Create new transaction id on based on pay_site,work_site,emp_site */
private String checkNull(String input) private String checkNull(String input)
{ {
if (input == null || ("null").equalsIgnoreCase(input.trim())) if (input == null || ("null").equalsIgnoreCase(input.trim()))
...@@ -728,7 +927,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -728,7 +927,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
} }
//Modified by Ahmed on 12/AUG/2016[A16BSUN002][This method is used to only check for null value][END] //Modified by Ahmed on 12/AUG/2016[A16BSUN002][This method is used to only check for null value][END]
private void close(PreparedStatement pstmt, ResultSet rs) private void close(PreparedStatement pstmt, ResultSet rs) throws ITMException
{ {
try try
{ {
...@@ -746,6 +945,9 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital ...@@ -746,6 +945,9 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
catch(Exception ex) catch(Exception ex)
{ {
ex.printStackTrace(); ex.printStackTrace();
//modified by Shital on 12/08/2019 [Start]
throw new ITMException(ex);
//modified by Shital on 12/08/2019 [End]
} }
} }
} }
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