Commit d574f857 authored by pbhosale's avatar pbhosale

Updated on[25/11/2019][changes done as suggested by Piyush sir.]

InterestProcess.java
InterestProcessConfPrc.java
PayrollArrearsProcessingPrc.java
PayrollSinglePrc.java
PayrollSplitgenAccPrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212684 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0bf748d7
......@@ -14,7 +14,6 @@ import java.util.Map;
import java.util.Set;
import ibase.utility.E12GenericUtility;
import ibase.webitm.bean.adm.LogWriterDatabase;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.sys.UtilMethods;
......@@ -23,7 +22,10 @@ import ibase.webitm.utility.ITMException;
public class InterestProcess extends ValidatorEJB
{
E12GenericUtility genericUtility = new E12GenericUtility();
LogWriterDatabase logWriter = new LogWriterDatabase();
//Modified By Poonam B[15/11/2019][START]
//LogWriterDatabase logWriter = new LogWriterDatabase();
HRLogWriter logWriter = new HRLogWriter();
//Modified By Poonam B[15/11/2019][END]
UtilMethods utilmethod = new UtilMethods();
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
AdmCommon admCommon = new AdmCommon();
......@@ -35,9 +37,23 @@ public class InterestProcess extends ValidatorEJB
String isLogObjName = logWriter.getObjName();
String isActivity = logWriter.getActivity();
String isProcId = logWriter.getProcessId();
String isLogFileName = logWriter.getLogFileName();
String isProcMode = "D";
//Added By Poonam B[21/11/2019][START]
private String isProcMode = "D";
private String isLogFileName = logWriter.getLogFileName();
public String getIsLogFileName() {
return isLogFileName;
}
public void setIsLogFileName(String isLogFileName) {
this.isLogFileName = isLogFileName;
}
public String getIsProcMode() {
return isProcMode;
}
public void setIsProcMode(String isProcMode) {
this.isProcMode = isProcMode;
}
//Added By Poonam B[21/11/2019][END]
//gbf_loan_confirm_no_edi = loanConfirmNoEdi
public String loanConfirmNoEdi(String lsLoanNo, Timestamp ldEff, Timestamp ldExp, double lcIntAmt, String lsScheme, String empCode, int aiCommit, String xtraParams, Connection conn) throws ITMException
{
......@@ -644,7 +660,12 @@ public class InterestProcess extends ValidatorEJB
lcLoanAmt = ((Double) dwLoanInfoMap.get("loan_amt")).doubleValue();
System.out.println("ldInterestDate===> " +ldInterestDate);
logWriter.setTotalRows(logWriter.getTotalRows()+1);
//Added By Poonam B[25/11/2019][START]
if(ldInterestDate == null)
{
ldInterestDate = ldIssue;
}
//Added By Poonam B[25/11/2019][END]
while (1 == 1)
{
liPyrl = 0;
......@@ -679,16 +700,21 @@ public class InterestProcess extends ValidatorEJB
}
rsLoanRegCnt.close();
pstmtLoanRegCnt.clearParameters();
System.out.println("ll_rowcnt:::"+ll_rowcnt);
if(ll_rowcnt == 0)
{
ldFrom = ldInterestDate;
}
else
{
ldFrom = utilmethod.dateTime(utilmethod.RelativeDate(utilmethod.dateTime(ldInterestDate), 1));
System.out.println("ldFrom == "+ldFrom);
//Modified by Poonam B[15/11/2019][START][To avoid null pointer]
if(ldInterestDate != null)
{
ldFrom = utilmethod.dateTime(utilmethod.RelativeDate(utilmethod.dateTime(ldInterestDate), 1));
}
//Modified by Poonam B[15/11/2019][END][To avoid null pointer]
}
System.out.println("ldFrom == "+ldFrom);
if(ldRelieve != null && ldRelieve.before(ldTo))
{
ldTodate = ldRelieve;
......@@ -2613,61 +2639,65 @@ public class InterestProcess extends ValidatorEJB
//gbf_set_log_properties_by_caller = gbfSetLogPropertiesByCaller
public void gbfSetLogPropertiesByCaller(HRLogWriter logwriterDb)
{
//Modified By Poonam B on[27/08/2019][Start]
//Modified By Poonam B on[15/11/2019][Start]
//LogWriterDatabase istrLogWriter = new LogWriterDatabase();
HRLogWriter istrLogWriter = new HRLogWriter();
//HRLogWriter istrLogWriter = new HRLogWriter(); //Modified By Poonam B[15/11/2019]
//Modified By Poonam B on[27/08/2019][Start]
try
{
System.out.println("Inside InterestProcess.gbfSetLogPropertiesByCaller()");
istrLogWriter.setJobID(logwriterDb.getJobID());
istrLogWriter.setLineNo(logwriterDb.getLineNo());
istrLogWriter.setObjName(logwriterDb.getObjName());
logWriter.setJobID(logwriterDb.getJobID());
logWriter.setLineNo(logwriterDb.getLineNo());
logWriter.setObjName(logwriterDb.getObjName());
//Modified By Poonam B on[27/08/2019][Start]
//if(istrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
//Modified By Poonam B on[25/11/2019][START]
//if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
if(logWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
//Modified By Poonam B on[25/11/2019][END]
{
//Modified By Poonam B on[27/08/2019][END]
istrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
istrLogWriter.setTransactionCreatedBy("caller");
//logWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
//Modified By Poonam B on[27/08/2019][END]
logWriter.setTransactionCreatedBy("caller");
}
if(logwriterDb.getLogFileName() != null && logwriterDb.getLogFileName().trim().length() > 0)
{
istrLogWriter.setLogFileName(logwriterDb.getLogFileName());
istrLogWriter.setLogFileCreatedBy("caller");
logWriter.setLogFileName(logwriterDb.getLogFileName());
logWriter.setLogFileCreatedBy("caller");
}
if(logwriterDb.getFilePointer() != 0 && logwriterDb.getFilePointer() > 0)
{
istrLogWriter.setFilePointer(logwriterDb.getFilePointer());
istrLogWriter.setLogFileCreatedBy("caller");
logWriter.setFilePointer(logwriterDb.getFilePointer());
logWriter.setLogFileCreatedBy("caller");
}
if(logwriterDb.getWsrLogFileName() != null && logwriterDb.getWsrLogFileName().trim().length() > 0)
{
istrLogWriter.setWsrLogFileName(logwriterDb.getWsrLogFileName());
logWriter.setWsrLogFileName(logwriterDb.getWsrLogFileName());
}
if(logwriterDb.getLogLocationType() != null && logwriterDb.getLogLocationType().trim().length() > 0)
{
istrLogWriter.setLogLocationType(logwriterDb.getLogLocationType());
istrLogWriter.setLogServerAddress(logwriterDb.getLogServerAddress());
logWriter.setLogLocationType(logwriterDb.getLogLocationType());
logWriter.setLogServerAddress(logwriterDb.getLogServerAddress());
}
istrLogWriter.setProcessId(logwriterDb.getProcessId());
istrLogWriter.setLogLineNo(logwriterDb.getLogLineNo());
logWriter.setProcessId(logwriterDb.getProcessId());
logWriter.setLogLineNo(logwriterDb.getLogLineNo());
if(logwriterDb.getStartDateTime() != null)
{
istrLogWriter.setStartDateTime(logwriterDb.getStartDateTime());
logWriter.setStartDateTime(logwriterDb.getStartDateTime());
}
//Added By Poonam B on[27/08/2019][Start]
if(logwriterDb.getJobID() != null && logwriterDb.getJobID().trim().length() > 0)
{
istrLogWriter.setJobID(logwriterDb.getJobID());
logWriter.setJobID(logwriterDb.getJobID());
}
//Modified By Poonam B on[15/11/2019][END]
//Added By Poonam B on[27/08/2019][END]
}
catch (Exception e)
......@@ -2687,4 +2717,4 @@ public class InterestProcess extends ValidatorEJB
return argStr;
}
}
}
\ No newline at end of file
......@@ -2,21 +2,17 @@ package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.HashMap;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ibase.webitm.ejb.adm.*;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.adm.HRLogWriter;
//import ibase.webitm.bean.adm.LogWriterDatabase;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.adm.adv.LogWriter;
import ibase.webitm.ejb.adm.adv.PayrollVoucherConf;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.sys.UtilMethods;
......@@ -35,8 +31,16 @@ public class InterestProcessConfPrc extends ProcessEJB
int rowCount = 0, rowcnt = 0;
String userId = "", chgTerm = "", loginSite = "";
int iiInterval, iiPctComplete = 0;
String isSingle = "N";
private String isSingle = "N";
//Added by Poonam B [21/11/2019][START]
public String getIsSingle() {
return isSingle;
}
public void setIsSingle(String isSingle) {
this.isSingle = isSingle;
}
//Added by Poonam B [21/11/2019][END]
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException
{
Document headerDom = null;
......@@ -45,7 +49,10 @@ public class InterestProcessConfPrc extends ProcessEJB
logWriter = new HRLogWriter();
Connection conn = null;
Connection logConn = null;
String chgTerm = "", loginSite = "", userId = "", jobId = "", objName = "";
// Commented by Poonam B[25/11/2019][variables declared at class level].Start
// String chgTerm = "", loginSite = "", userId = "", jobId = "", objName = "";
String jobId = "", objName = "";
// Commented by Poonam B[25/11/2019][variables declared at class level].End
try
{
conn = getConnection();
......@@ -71,8 +78,12 @@ public class InterestProcessConfPrc extends ProcessEJB
logWriter.setRowsProcessed(0);
logWriter.setRowsIgnored(0);
logWriter.setRowsRejected(0);
objName = getObjNameFromDom(headerDom, "objName");
logWriter.setCurrentProcess("InterestProcess");
logWriter.setActivity("InterestProcess");
logWriter.setProcessId("InterestProcess");
logWriter.setFileNameStartWith("INTPROC");
logWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, "InterestProcess", "INTPROC", loginSite, logConn);
retStr = process(headerDom, detailDom, windowName, xtraParams, logWriter, conn, logConn);
System.out.println("Return from InterestProcessConfPrc :::: "+retStr);
......@@ -106,7 +117,9 @@ public class InterestProcessConfPrc extends ProcessEJB
/*public String process(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws ITMException
{*/
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter logWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
// Changed argument name of logwriter
//public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter logWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter logWriterArg, Connection conn, Connection logConn) throws RemoteException, ITMException
{
String lsSysErrStr = "" , lsErrText = "";
int liLogFilePtr = -1;
......@@ -118,17 +131,18 @@ public class InterestProcessConfPrc extends ProcessEJB
try
{
logWriter = logWriterArg; //Added By Poonam B[15/11/2019]
System.out.println("<<< Inside InterestProcessConfPrc.process() >>>");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
gbflogWriterMap = new HashMap<>();
objName = getObjNameFromDom(headerDom, "objName");
logWriter.setCurrentProcess("InterestProcess");
logWriter.setActivity("InterestProcess");
logWriter.setProcessId("InterestProcess");
//logWriter.setProcessId("InterestProcess"); // Commented by Poonam B[21/11/2019] [Process id can not be changed from this method].Start
logWriter.setFileNameStartWith("INTPROC");
currentProcess = logWriter.getCurrentProcess();
......@@ -137,8 +151,8 @@ public class InterestProcessConfPrc extends ProcessEJB
fileNameStartWith = logWriter.getFileNameStartWith();
System.out.println("objName : "+objName+" \ncurrentProcess = "+currentProcess+" \nactivity = "+activity+" \nprocessId = "+processId+" \nfileNameStartWith = "+fileNameStartWith);
System.out.println("userId : "+userId+ " \nloginSite = "+loginSite+" \nxtraParams = "+xtraParams);
/*gbflogWriterMap.put("objName", objName);
/*gbflogWriterMap.put("objName", objName);
gbflogWriterMap.put("currentProcess", currentProcess);
gbflogWriterMap.put("activity", activity);
gbflogWriterMap.put("processId", processId);
......@@ -162,12 +176,20 @@ public class InterestProcessConfPrc extends ProcessEJB
liLogFilePtr = logWriter.getLogWriterFlag();
if (liLogFilePtr < 0)
{
gbfReleaseLogWriter(headerDom, logWriter, conn);
// Removed logwriter as defined at class level
// gbfReleaseLogWriter(headerDom, logWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
// return is_errxml
}
// Removed logwriter as defined at class level.Start
/*
errString = processInterest(headerDom, detailDom, windowName, xtraParams, logWriter, conn, logConn);
gbfReleaseLogWriter(headerDom, logWriter, conn);
*/
errString = processInterest(headerDom, detailDom, windowName, xtraParams, conn, logConn);
gbfReleaseLogWriter(headerDom, conn);
// Removed logwriter as defined at class level.End
System.out.println("InterestProcessConfPrc.process() errString is ====> "+errString);
}
......@@ -182,7 +204,9 @@ public class InterestProcessConfPrc extends ProcessEJB
return errString;
}
public int gbfReleaseLogWriter(Document headerDom, HRLogWriter logWriter, Connection logConn) throws ITMException
// Removed logwriter from argument as logwriter is defined at class level
// public int gbfReleaseLogWriter(Document headerDom, HRLogWriter logWriter, Connection logConn) throws ITMException
public int gbfReleaseLogWriter(Document headerDom, Connection logConn) throws ITMException
{
int liRet = 1;
String lsLogStr = "", frEmp = "", toEmp = "", fromPrd = "", toPrd = "", frSite = "", toSite = "", mtype = "";
......@@ -232,11 +256,11 @@ public class InterestProcessConfPrc extends ProcessEJB
if (frSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase()))
{
lsLogStr = "Processing Over for Site: " + frSite;
lsLogStr = "Interest Process Processing Over for Site: " + frSite;
}
else
{
lsLogStr = "Processing Over for Sites between: " + frSite + " To: " + toSite;
lsLogStr = "Interest Process Processing Over for Sites between: " + frSite + " To: " + toSite;
}
//gbf_err_write("","",mtype,ls_log_str , "I")
//logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
......@@ -277,7 +301,10 @@ public class InterestProcessConfPrc extends ProcessEJB
}
//gbf_process_interest = processInterest
private String processInterest(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter logWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
// Removed logwriter from argument as logwriter is defined at class level
// private String processInterest(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter logWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
private String processInterest(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
{
String lsLoanFr = "", lsLoanTo = "", lsPrdCode = "",lsEmpCode = "", lsEmpCodeFr = "", lsEmpCodeTo = "", lsErrCode = "", lsLoanNo = "",
lsIntTerm = "", lsSiteCode = "", lsSiteCodeTo = "", lsScheme = "", lsFileName = "";
......@@ -287,6 +314,7 @@ public class InterestProcessConfPrc extends ProcessEJB
double lcBalAmt = 0.0, lcIntPerc = 0.0, lcIntAmt = 0.0;
int liNoDays = 0, liLogFilePtr = 0, liFileWrite = -1, liFileClose = 0;
//logWriter = new LogWriterDatabase();
this.logWriter = logWriter; //Added by Poonam B[22/11/2019]
UtilMethods utilMethod = new UtilMethods();
InterestProcess interestProcess = null;
......@@ -398,11 +426,15 @@ public class InterestProcessConfPrc extends ProcessEJB
if("Y".equalsIgnoreCase(isSingle))
{
interestProcess.isProcMode = "I";
//Modified by Poonam B[25/11/2019][START]
//interestProcess.isProcMode = "I";
interestProcess.setIsProcMode("I");
//Modified by Poonam B[25/11/2019][END]
}
interestProcess.isLogFileName = lsLogFileName;
//Modified By Poonam B[21/11/2019][START]
//interestProcess.isLogFileName = lsLogFileName;
interestProcess.setIsLogFileName(lsLogFileName);
//Modified By Poonam B[21/11/2019][END]
lsLogStr = "Interest Process is Started";
logWriter.setStatusDetail(lsLogStr);
logWriter.setErrorCode("");
......@@ -422,7 +454,7 @@ public class InterestProcessConfPrc extends ProcessEJB
interestProcess.gbfSetLogPropertiesByCaller(logWriter);
lsErrCode = interestProcess.empLoanIntProc(lsLoanFr, lsLoanTo, lsEmpCodeFr, lsEmpCodeTo, lsPrdCode, "Y", lsSiteCode, lsSiteCodeTo, lsProcGrpFr, lsProcGrpTo, xtraParams, conn);
//gbfSetLogPropertiesFromTarget(lv_loanobj);
gbfSetLogPropertiesFromTarget();
//gbfSetLogPropertiesFromTarget(); //commented by Poonam B[25/11/2019][method has never used]
int rowsProcessed = logWriter.getRowsProcessed();
int rowsRejected = logWriter.getRowsRejected();
......@@ -538,21 +570,22 @@ public class InterestProcessConfPrc extends ProcessEJB
return logWriter;
//return istrLogWriter;
}*/
public HRLogWriter gbfServeLogPropertiesToCaller()
//Commented By Poonam B[25/11/2019][START][Method has never used]
/*public HRLogWriter gbfServeLogPropertiesToCaller()
{
//LogWriterDatabase istrLogWriter = new LogWriterDatabase();
logWriter = new HRLogWriter();
//logWriter = new HRLogWriter(); //Added By Poonam B[15/11/2019]
return logWriter;
//return istrLogWriter;
}
}*/
//Commented By Poonam B[25/11/2019][END][Method has never used]
//gbf_set_log_properties_by_caller = gbfSetLogPropertiesByCaller
//public void gbfSetLogPropertiesByCaller(LogWriterDatabase logwriterDb)
public void gbfSetLogPropertiesByCaller(HRLogWriter logwriterDb)
{
//LogWriterDatabase istrLogWriter = new LogWriterDatabase();
//logWriter = new LogWriterDatabase();
logWriter = new HRLogWriter();
//logWriter = new HRLogWriter(); //Added By Poonam B[15/11/2019]
try
{
......@@ -560,12 +593,14 @@ public class InterestProcessConfPrc extends ProcessEJB
logWriter.setJobID(logwriterDb.getJobID());
logWriter.setLineNo(logwriterDb.getLineNo());
logWriter.setObjName(logwriterDb.getObjName());
//Modified By Poonam B on[26/08/2019][Start]
//Modified By Poonam B on[25/11/2019][Start]
//if(logWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
//Modified By Poonam B on[26/08/2019][End]
//if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
if(logWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
{
logWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
//logWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
//Modified By Poonam B on[25/11/2019][End]
logWriter.setTransactionCreatedBy("caller");
}
......@@ -614,17 +649,21 @@ public class InterestProcessConfPrc extends ProcessEJB
}
System.out.println("InterestProcessConfPrc.gbf_set_log_properties_by_caller()======= Completed");
}
//Commented By Poonam B[25/11/2019][START][method has never used]
//gbf_set_logproperties_from_target = gbfSetLogPropertiesFromTarget
public void gbfSetLogPropertiesFromTarget()
/*public void gbfSetLogPropertiesFromTarget()
{
System.out.println("InterestProcessConfPrc.gbfSetLogPropertiesFromTarget()");
//Modified By Poonam B[15/11/2019][START]
//LogWriterDatabase lstrLogWriter = new LogWriterDatabase();
logWriter = new HRLogWriter();
logWriter = gbfServeLogPropertiesToCaller();
//logWriter = new HRLogWriter(); //Modified By Poonam B[15/11/2019]
HRLogWriter logWriter1 = gbfServeLogPropertiesToCaller();
logWriter.setLineNo(logWriter1.getLineNo());
//logWriter = gbfServeLogPropertiesToCaller();
//Modified By Poonam B[15/11/2019][END]
//lstrLogWriter = gbfServeLogPropertiesToCaller();
}
}*/
//Commented By Poonam B[25/11/2019][END][method has never used]
private String getObjNameFromDom(Document dom, String attribute) throws RemoteException, ITMException
{
String objName = "";
......@@ -655,4 +694,4 @@ public class InterestProcessConfPrc extends ProcessEJB
return input == null ? "" : input;
}
}
}
\ No newline at end of file
......@@ -31,13 +31,39 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
HRLogWriter hrLogWriter = new HRLogWriter();
UtilMethods utilMethod = new UtilMethods();
String userId = "", chgTerm = "", loginSite = "";
String isOwrite = "N";
boolean ibTodoprojection = true;
String isLogfileName = "";
//Added By Poonam B[21/11/2019][START][To use variable outside]
//String isOwrite = "N";
private String isOwrite = "N";
private String isLogfileName = "";
private boolean ibTodoprojection = true;
public String getIsOwrite() {
return isOwrite;
}
public void setIsOwrite(String isOwrite) {
this.isOwrite = isOwrite;
}
public String getIsLogfileName() {
return isLogfileName;
}
public void setIsLogfileName(String isLogfileName) {
this.isLogfileName = isLogfileName;
}
public boolean isIbTodoprojection() {
return ibTodoprojection;
}
public void setIbTodoprojection(boolean ibTodoprojection) {
this.ibTodoprojection = ibTodoprojection;
}
//Added By Poonam B[21/11/2019][END][To use variable outside]
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException
{
Document detailDom = null;
Document headerDom = null;
String retStr = "";
......@@ -71,6 +97,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
objName = getObjNameFromDom(headerDom, "objName");
System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
hrLogWriter.setProcessId("ChangeArrearsProcess"); //Added by Poonam B[21/11/2019]
hrLogWriter.setActivity("ArrearsProcess");
hrLogWriter.setFileNameStartWith("CHGARRPROC_");
activity = hrLogWriter.getActivity();
......@@ -124,7 +151,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
return retStr;
}// END OF PROCESS
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
// Change argument name of hrlogwriter
// public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriterArg, Connection conn, Connection logConn) throws RemoteException, ITMException
{
UserInfoBean userinfo = new UserInfoBean();
ResultSet rs = null, rs1 = null;
......@@ -139,6 +168,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
try
{
hrLogWriter = hrLogWriterArg; // Mapped argument to class level variable
System.out.println("****Inside PayrollArrearsProcessingPrc process method called*****");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
......@@ -148,7 +178,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
//System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
hrLogWriter.setCurrentProcess("ChangeArrearsProcess");
//hrLogWriter.setActivity("ArrearsProcess");
hrLogWriter.setProcessId("ChangeArrearsProcess");
//hrLogWriter.setProcessId("ChangeArrearsProcess"); // commented By Poonam B[21/11/2019]
//hrLogWriter.setFileNameStartWith("CHGARRPROC_");
currentProcess = hrLogWriter.getCurrentProcess();
//activity = hrLogWriter.getActivity();
......@@ -179,6 +209,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
}
mtype = checkNull(genericUtility.getColumnValue("type", headerDom));
System.out.println("mtype::: " + mtype);
// To be used logwriter method.Start
/*
hrLogWriter = gbfErrWrite("", "", "Process Started", "I",hrLogWriter,logConn);
errorCode = hrLogWriter.getReturnUpdError();
if(errorCode != null && errorCode.trim().length() > 0)
......@@ -186,10 +219,19 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
errString = errorCode;
return errString;
}
errString = gbfProcessChangeArrears(headerDom, xtraParams,hrLogWriter, conn,logConn);
*/
hrLogWriter.gbfErrWrite("", "","", "Process Started", "I",logConn);
// To be used logwriter method.End
// Removed logwriter argument as it is declared at class level
// errString = gbfProcessChangeArrears(headerDom, xtraParams,hrLogWriter, conn,logConn);
errString = gbfProcessChangeArrears(headerDom, xtraParams, conn,logConn);
System.out.println("errString coming from gbfProcessChangeArrears::: " + errString);
if("Y".equalsIgnoreCase(hrLogWriter.getJobTerminateRequested()))
{
// To be used logwriter method.Start
/*
hrLogWriter = gbfErrWrite("", "","Process Terminated on request" ,"I",hrLogWriter,logConn) ;
errorCode = hrLogWriter.getReturnUpdError();
if(errorCode != null && errorCode.trim().length() > 0)
......@@ -197,6 +239,11 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
errString = errorCode;
return errString;
}
*/
hrLogWriter.gbfErrWrite("", "","", "Process Terminated on request", "I",logConn);
// To be used logwriter method.End
}
/*catch (corbacommfailure ccf)
......@@ -238,8 +285,14 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
end if*/
lsLogStr = "Total Employees: " + String.valueOf(hrLogWriter.getRowsProcessed() + hrLogWriter.getRowsRejected()).trim() + " Processed: " + String.valueOf(hrLogWriter.getRowsProcessed()).trim() + " Rejected: " + String.valueOf(hrLogWriter.getRowsRejected()).trim();
// To be used logwriter method.Start
/*
hrLogWriter = gbfErrWrite("", "", lsLogStr, "I", hrLogWriter, logConn);
hrLogWriter = gbfErrWrite("", "", "Process Over", "I", hrLogWriter, logConn);
*/
hrLogWriter.gbfErrWrite("", "","", lsLogStr, "I",logConn);
hrLogWriter.gbfErrWrite("", "","", "Process Over", "I",logConn);
// To be used logwriter method.End
gbfReleaseLogWriter();
}//END TRY PROCESS
......@@ -253,7 +306,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
return errString;
}
private String gbfProcessChangeArrears(Document headerDom,String xtraParams,HRLogWriter hrLogWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
// Removed logwriter argument as logwriter is declared at class level
// private String gbfProcessChangeArrears(Document headerDom,String xtraParams,HRLogWriter hrLogWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
private String gbfProcessChangeArrears(Document headerDom,String xtraParams, Connection conn,Connection logConn) throws RemoteException, ITMException
{
String lsEmpcodeFr = "", lsEmpcodeTo = "", lsPrdcodeArr = "", lsSitecodeFr = "", lsSitecodeTo = "", lsProcFr = "", lsProcTo = "";
String lsEmpcode = "", lsPrdcode = "", mtype = "";
......@@ -378,11 +433,14 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
errString = "NORECFND";
return errString;
}
splitgenAcc.isOwrite = "Y";
//Modified By Poonam B[25/11/2019][START]
//splitgenAcc.isOwrite = "Y";
splitgenAcc.setIsOwrite("Y");
isLogfileName = hrLogWriter.getLogFileName();
//splitgenAcc.isLogfileName = isLogfileName;
splitgenAcc.isCaller = "CHANGEARREARSPROCESS";
//splitgenAcc.isCaller = "CHANGEARREARSPROCESS";
splitgenAcc.setIsCaller("CHANGEARREARSPROCESS");
//Modified By Poonam B[25/11/2019][END]
rowcnt = headerRowMap.size();
System.out.println("rowcnt---[" + rowcnt + "]");
......@@ -641,7 +699,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
}
return errString;
}
// Removed local method as to be used of logwriter class
/*
public HRLogWriter gbfErrWrite (String asType, String asEmpCode, String asErrcode, String asMsgType,HRLogWriter hrLogWriter,Connection logConn) throws ITMException
{
String lsStr = "" , lsErr = "" , lsErrcode = "";
......@@ -681,6 +741,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
}
return hrLogWriter;
}
*/
public int gbfReleaseLogWriter() throws ITMException
{
......@@ -733,7 +794,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
if(hrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
{
hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
// hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
hrLogWriter.setTransactionCreatedBy("caller");
}
......@@ -831,4 +892,4 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
}
return input;
}
}
}
\ No newline at end of file
/*
Window Name : w_payroll_single
Auther : Poonam
*/
*/
package ibase.webitm.ejb.adm;
......@@ -11,7 +11,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
//import java.text.SimpleDateFormat;
import javax.ejb.Stateless;
......@@ -38,14 +37,14 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
PayrollArrearsProcessingPrc payrollArrearsProcessingPrc = null;
HRLogWriter hrLogWriter = null;
UserInfoBean userinfo = null;
String isLogLocationType = "N";
String userId = "", chgTerm = "", loginSite = "",jobId = "", objName = "";
String isLogLocationType = "N";
String userId = "", chgTerm = "", loginSite = "", jobId = "", objName = "";
String isLogObjname = "payroll_single";
/*String isActivity = "CompleteProcess";
String isProcId = "CompletePayrollProcess";
String isLogServerAddress = "";
String isWsrLogfname = "";*/
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException
{
System.out.println("PayrollSinglePrc process(String xmlString, String xmlString2, String windowName, String xtraParams) called.............!");
......@@ -86,10 +85,10 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
hrLogWriter.setActivity("CompleteProcess");
hrLogWriter.setActivity("Complete Process");
activity = hrLogWriter.getActivity();
hrLogWriter.setProcessId("CompletePayrollProcess");
hrLogWriter.setFileNameStartWith("CHGARRPROC_");
hrLogWriter.setProcessId("Complete Payroll Process");
hrLogWriter.setFileNameStartWith("COMPPAYPROC_");
fileNameStartWith = hrLogWriter.getFileNameStartWith();
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, activity, fileNameStartWith, loginSite, logConn);
retErrStr = gbfProcess(headerDom, detailDom, windowName, xtraParams, hrLogWriter, conn,logConn);
......@@ -141,13 +140,16 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
return retStr;
}
public String gbfProcess(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws ITMException, IOException
// Changed argujment name of logwriter
//public String gbfProcess(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws ITMException, IOException
public String gbfProcess(Document headerDom, Document detailDom, String windowName, String xtraParams, HRLogWriter hrLogWriterArg, Connection conn, Connection logConn) throws ITMException, IOException
{
System.out.println("**** PayrollSinglePrc process() method called ****");
interestProcess = new InterestProcess();
payrollSplitgenAccPrc = new PayrollSplitgenAccPrc();
interestProcessConfPrc = new InterestProcessConfPrc();
payrollArrearsProcessingPrc = new PayrollArrearsProcessingPrc();
this.hrLogWriter = hrLogWriter;
//this.hrLogWriter = hrLogWriter;
ResultSet rs = null;
PreparedStatement pstmt = null;
//SimpleDateFormat sdf = null;
......@@ -177,7 +179,7 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
String payrollDateStr = "";
//String todayDateStr = "";
String lsFileName = "";
String isLogObjName = "";
//String isLogObjName = "";
String isProcId = "";
//String isWsrLogFname = "";
int liFile = 0;
......@@ -190,28 +192,29 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
String lsLogStr = "";
int cnt = 0;
//int filePtr = 0;
boolean isProcessStarted = false; //Added by Poonam b[21/11/2019]
try
{
System.out.println("****Inside PayrollSinglePrc process method called*****");
jobId = hrLogWriter.getJobID();
System.out.println("jobId:::::::::::::::::::" +jobId );
hrLogWriter = hrLogWriterArg; // Assigned argument to class level variable
System.out.println("****Inside PayrollSinglePrc process Try block called*****");
/*jobId = hrLogWriter.getJobID();
System.out.println("jobId:::::::::::::::::::" +jobId ); */
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
valueXmlString = new StringBuffer("<DocumentRoot><description>Datawindow Root</description><group0>");
valueXmlString.append("<description>Group0 description</description>").append("<Header0>");
valueXmlString.append("<description>Header0 members</description>");
valueXmlString.append("<Detail1 dbID=\"\" domID=\"1\" objContext=\"1\" objName=\"payroll_single\">");
valueXmlString.append("<attribute pkNames=\"\" selected=\"\" status=\"\" updateFlag=\"\"/>");
valueXmlStr = valueXmlString.toString();
valueXmlStr = valueXmlString.toString();
do
{
/*sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
todayDateStr = sdf.format(new java.util.Date());*/
interestProcessConfPrc.isSingle = "Y";
payrollSplitgenAccPrc.isSingle = "Y";
payrollSplitgenAccPrc.isCaller = "SINGLE";
hrLogWriter.setCurrentProcess("COMPLETEPROCESS");
//interestProcessConfPrc.isSingle = "Y";
interestProcessConfPrc.setIsSingle("Y");
//payrollSplitgenAccPrc.isCaller = "SINGLE";
payrollSplitgenAccPrc.setIsCaller("SINGLE");
empCodeFr = checkNull(genericUtility.getColumnValue("emp_code__fr", headerDom));
empCodeTo = checkNull(genericUtility.getColumnValue("emp_code__to", headerDom));
if(empCodeFr == null || empCodeFr.trim().length() == 0)
......@@ -250,28 +253,33 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
payrollDate = Timestamp.valueOf(genericUtility.getValidDateTimeString(payrollDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
}
System.out.println("payrollDate:::::::::::::" +payrollDate);
//hrLogWriter.initializeHRLogWriter(objName, jobID, userId, chgTerm, activity, fileNameStartName, loginSite, conn);
liFile = hrLogWriter.getLogWriterFlag();
if(liFile == -1)
{
gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
return errString;
// Removed logwriter argument as class level defined
//gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
return errorCode;
}
else
{
lsFileName = hrLogWriter.getLogFileName();
isLogObjName = hrLogWriter.getObjName();
System.out.println("Log File name::::: " +lsFileName);
isProcId = hrLogWriter.getProcessId();
//filePtr = hrLogWriter.getFilePointer();
interestProcess.isLogFileName = lsFileName;
payrollSplitgenAccPrc.isFilename = lsFileName;
payrollArrearsProcessingPrc.isLogfileName = lsFileName;
payrollSplitgenAccPrc.isFilename = isLogObjName;
payrollSplitgenAccPrc.isProcId = isProcId;
//Modified By Poonam B [21/11/2019][START]
//interestProcess.isLogFileName = lsFileName;
interestProcess.setIsLogFileName(lsFileName);
//payrollSplitgenAccPrc.isFilename = lsFileName;
payrollSplitgenAccPrc.setIsFilename(lsFileName);
//payrollArrearsProcessingPrc.isLogfileName = lsFileName;
payrollArrearsProcessingPrc.setIsLogfileName(lsFileName);
//payrollSplitgenAccPrc.isFilename = isLogObjName;
//payrollSplitgenAccPrc.isProcId = isProcId;
payrollSplitgenAccPrc.setIsProcId(isProcId);
//isWsrLogFname = hrLogWriter.getWsrLogFileName();
//Modified By Poonam B [21/11/2019][END]
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
......@@ -281,8 +289,9 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
isProcessStarted = true; //Added by Poonam b[21/11/2019]
}
System.out.println("Complete Process Starts between cbx_ap_changes or cbx_ap!!!!"+cbxApChanges+":::"+cbxAp);
cbxApChanges = checkNull(genericUtility.getColumnValue("cbx_ap_changes", headerDom));
cbxAp = checkNull(genericUtility.getColumnValue("cbx_ap", headerDom));
if("Y".equalsIgnoreCase(cbxApChanges) || "Y".equalsIgnoreCase(cbxAp))
......@@ -321,25 +330,30 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
lsLogStr = "Complete Payroll Processing Over for Site: " + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
// Removed logwriter argument as class level defined
//gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
return errorCode;
}
}
// -------------- InterestProcessConfPrc.java--------------------------
System.out.println("Complete Process Starts between cbx_ip and cbx_pp and cbx_py!!!!"+cbxIp+":::"+cbxPp+":::"+cbxPy);
cbxIp = checkNull(genericUtility.getColumnValue("cbx_ip", headerDom));// Interest Processing
cbxPp = checkNull(genericUtility.getColumnValue("cbx_pp", headerDom));// Payroll Projection
cbxPy = checkNull(genericUtility.getColumnValue("cbx_py", headerDom));//Payroll Processing
if (("Y".equalsIgnoreCase(cbxIp)) && (("Y".equalsIgnoreCase(cbxPp)) || ("Y".equalsIgnoreCase(cbxPy))))
{
interestProcessConfPrc.isSingle = "Y";
//interestProcessConfPrc.isSingle = "Y";
interestProcessConfPrc.setIsSingle("Y");
valueXmlString1 = new StringBuffer();
valueXmlString1.append("<prd_code>").append("<![CDATA[" + prdCodeFr +"]]>").append("</prd_code>");
valueXmlString1.append("<emp_code>").append("<![CDATA[" + empCodeFr +"]]>").append("</emp_code>");
......@@ -357,19 +371,38 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
{
arrHeaderDom = genericUtility.parseString(valueXmlStringArr.toString());
}
//Modified by Poonam B[21/11/2019][START]
interestProcessConfPrc.gbfSetLogPropertiesByCaller(hrLogWriter);
errString = interestProcessConfPrc.process(arrHeaderDom, arrHeaderDom, windowName, xtraParams, hrLogWriter, conn, logConn);
gbfSetLogPropertiesByCaller(hrLogWriter);
if(errString != null && errString.trim().length() > 0)
try
{
errString = interestProcessConfPrc.process(arrHeaderDom, arrHeaderDom, windowName, xtraParams, hrLogWriter, conn, logConn);
//Added code to convert errString into errorcode
if(errString != null && errString.trim().length() > 0)
{
headerDom1 = genericUtility.parseString(errString);
detailList = headerDom1.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
errorCode = currErrorId;
}
//Added code to convert errString into errorcode
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
}
// Commented By Poonam B[25/11/2019][method has never use][START]
//gbfSetLogPropertiesFromTarget();
// Commented By Poonam B[25/11/2019][method has never use][END]
if(errorCode != null && errorCode.trim().length() > 0 )
{
headerDom1 = genericUtility.parseString(errString);
detailList = headerDom1.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
errorCode = currErrorId;
hrLogWriter.gbfErrWrite("", "", "", errorCode, "I",logConn);
}
break;
//Modified by Poonam B[21/11/2019][END]
}
}
if(hrLogWriter.getJobID() != null && (hrLogWriter.getJobID().trim().length()) > 0)
{
......@@ -380,7 +413,8 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
}
}
// -------------- PayrollSplitgenAccPrc.java--------------------------
System.out.println("Complete Process Starts between cbx_pp and cbx_ap and cbx_ap_changes and cbx_py!!!!"+cbxPp+":::"+cbxAp+":::"+cbxApChanges+"::::"+cbxPy);
cbxPp = checkNull(genericUtility.getColumnValue("cbx_pp", headerDom));// Payroll Projection
cbxAp = checkNull(genericUtility.getColumnValue("cbx_ap", headerDom));// Arrears Processing
cbxApChanges = checkNull(genericUtility.getColumnValue("cbx_ap_changes", headerDom));//Changed Arrears Processing
......@@ -390,7 +424,8 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
if(("Y".equalsIgnoreCase(cbxPy)) || ("Y".equalsIgnoreCase(cbxAp)) || ("N".equalsIgnoreCase(cbxPy) && "N".equalsIgnoreCase(cbxAp) && "N".equalsIgnoreCase(cbxApChanges)))
{
lsPayrollProjYn = "N";
payrollSplitgenAccPrc.isOwrite = "Y";
//payrollSplitgenAccPrc.isOwrite = "Y";
payrollSplitgenAccPrc.setIsOwrite("Y");
processType = "PP";
valueXmlString1 = new StringBuffer();
valueXmlString1.append("<type>").append("<![CDATA[" + processType +"]]>").append("</type>");
......@@ -409,27 +444,42 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
valueXmlStringArr = new StringBuffer();
valueXmlStringArr.append(valueXmlStr).append(valueXmlString1);
System.out.println("valueXmlStringArr::: " + valueXmlStringArr);
if(valueXmlStringArr != null)
{
arrHeaderDom = genericUtility.parseString(valueXmlStringArr.toString());
}
//Modified by Poonam B[21/11/2019][START]
payrollSplitgenAccPrc.gbfSetLogPropertiesByCaller(hrLogWriter);
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
gbfSetLogPropertiesFromTarget();
try
{
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
}
// Commented By Poonam B[25/11/2019][method has never use][START]
//gbfSetLogPropertiesFromTarget();
// Commented By Poonam B[25/11/2019][method has never use][END]
if(errorCode != null && errorCode.trim().length() > 0 )
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
/*if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
lsLogStr = "Complete Payroll Processing Over for Site: " + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
return errorCode;
return errorCode; */
break;
//Modified by Poonam B[21/11/2019][END]
}
}
else if("Y".equalsIgnoreCase(cbxApChanges))
......@@ -451,13 +501,15 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
break;
}
}
// -------------- PayrollArrearsProcessingPrc.java--------------------------
System.out.println("Complete Process Starts between cbx_ap_changes !!!!"+cbxApChanges);
cbxApChanges = checkNull(genericUtility.getColumnValue("cbx_ap_changes", headerDom));//Changed Arrears Processing
if("Y".equalsIgnoreCase(cbxApChanges))
{
payrollArrearsProcessingPrc.ibTodoprojection = true;
//payrollArrearsProcessingPrc.ibTodoprojection = true;
payrollArrearsProcessingPrc.setIbTodoprojection(true);
processType = "AR";
valueXmlString1 = new StringBuffer();
valueXmlString1.append("<type>").append("<![CDATA[" + processType +"]]>").append("</type>");
......@@ -475,28 +527,44 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
valueXmlStringArr = new StringBuffer();
valueXmlStringArr.append(valueXmlStr).append(valueXmlString1);
System.out.println("valueXmlStringArr::: " + valueXmlStringArr);
if(valueXmlStringArr != null)
{
arrHeaderDom = genericUtility.parseString(valueXmlStringArr.toString());
}
//Modified by Poonam B[21/11/2019][START]
payrollArrearsProcessingPrc.gbfSetLogPropertiesByCaller(hrLogWriter);
errorCode = payrollArrearsProcessingPrc.process(arrHeaderDom, arrHeaderDom, windowName,xtraParams, hrLogWriter, conn, logConn);
gbfSetLogPropertiesFromTarget();
payrollSplitgenAccPrc.isCaller = "SINGLE";
if(errorCode != null && errorCode.trim().length() > 0 )
try
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
return errorCode;
errorCode = payrollArrearsProcessingPrc.process(arrHeaderDom, arrHeaderDom, windowName,xtraParams, hrLogWriter, conn, logConn);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
}
// Commented By Poonam B[25/11/2019][method has never use][START]
//gbfSetLogPropertiesFromTarget();
// Commented By Poonam B[25/11/2019][method has never use][END]
//payrollSplitgenAccPrc.isCaller = "SINGLE";
payrollSplitgenAccPrc.setIsCaller("SINGLE");
if(errorCode != null && errorCode.trim().length() > 0 )
{/*
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Over for Site: " + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
return errorCode;*/
break;
//Modified by Poonam B[21/11/2019][END]
}
}
if(hrLogWriter.getJobID() != null && hrLogWriter.getJobID().trim().length() > 0)
......@@ -507,12 +575,15 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
break;
}
}
// -------------- PayrollSplitgenAccPrc.java--------------------------
System.out.println("Complete Process Starts between cbx_ap !!!!"+cbxAp);
cbxAp = checkNull(genericUtility.getColumnValue("cbx_ap", headerDom));// Arrears Processing
if("Y".equalsIgnoreCase(cbxAp))
{
payrollSplitgenAccPrc.isOwrite = "Y";
//payrollSplitgenAccPrc.isOwrite = "Y";
payrollSplitgenAccPrc.setIsOwrite("Y");
processType = "AR";
valueXmlString1 = new StringBuffer();
valueXmlString1.append("<type>").append("<![CDATA[" + processType +"]]>").append("</type>");
......@@ -531,29 +602,43 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
valueXmlStringArr = new StringBuffer();
valueXmlStringArr.append(valueXmlStr).append(valueXmlString1);
System.out.println("valueXmlStringArr::: " + valueXmlStringArr);
if(valueXmlStringArr != null)
{
arrHeaderDom = genericUtility.parseString(valueXmlStringArr.toString());
}
//Modified by Poonam B[21/11/2019][START]
payrollSplitgenAccPrc.gbfSetLogPropertiesByCaller(hrLogWriter);
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
gbfSetLogPropertiesFromTarget();
try
{
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
}
// Commented By Poonam B[25/11/2019][method has never use][START]
//gbfSetLogPropertiesFromTarget();
// Commented By Poonam B[25/11/2019][method has never use][END]
if(errorCode != null && errorCode.trim().length() > 0 )
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
/*if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
lsLogStr = "Complete Payroll Processing Over for Site: " + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
return errorCode;
return errorCode;*/
break;
//Modified by Poonam B[21/11/2019][END]
}
}
if(hrLogWriter.getJobID() != null && hrLogWriter.getJobID().trim().length() > 0)
......@@ -564,13 +649,17 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
break;
}
}
// -------------- PayrollSplitgenAccPrc.java --------------------------
System.out.println("Complete Process Starts between cbx_py !!!!"+cbxPy);
cbxPy = checkNull(genericUtility.getColumnValue("cbx_py", headerDom)); // Payroll Processing
if(cbxPy.equalsIgnoreCase("Y"))
{
payrollSplitgenAccPrc.isOwrite = "Y";
//Modified by Poonam B[21/11/2019][START]
//payrollSplitgenAccPrc.isOwrite = "Y";
payrollSplitgenAccPrc.setIsOwrite("Y");
//Modified by Poonam B[21/11/2019][END]
processType = "PY";
valueXmlString1 = new StringBuffer();
valueXmlString1.append("<type>").append("<![CDATA[" + processType +"]]>").append("</type>");
......@@ -589,28 +678,42 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
valueXmlStringArr = new StringBuffer();
valueXmlStringArr.append(valueXmlStr).append(valueXmlString1);
System.out.println("valueXmlStringArr::: " + valueXmlStringArr);
if(valueXmlStringArr != null)
{
arrHeaderDom = genericUtility.parseString(valueXmlStringArr.toString());
}
//Modified by Poonam B[21/11/2019][START]
payrollSplitgenAccPrc.gbfSetLogPropertiesByCaller(hrLogWriter);
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
gbfSetLogPropertiesFromTarget();
try
{
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
}
// Commented By Poonam B[25/11/2019][method has never use][START]
//gbfSetLogPropertiesFromTarget();
// Commented By Poonam B[25/11/2019][method has never use][END]
if(errorCode != null && errorCode.trim().length() > 0 )
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
/*if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
lsLogStr = "Complete Payroll Processing Over for Site: " + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
return errorCode;
return errorCode;*/
break;
//Modified by Poonam B[21/11/2019][END]
}
}
break;
......@@ -620,26 +723,48 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
if(hrLogWriter.getJobTerminateRequested().equalsIgnoreCase("Y"))
{
hrLogWriter.gbfErrWrite("","" ,"","Complete Payroll Process Terminated on request", "I", logConn);
}
}
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
/*if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Started for Site: " + siteCodeFr;
lsLogStr = "Complete Payroll Processing Over for Site:" + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Started for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);*/
}
catch (Exception e)
{
System.out.println("errorCode::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
System.out.println("Exception :PayrollSinglePrc :process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn):"
+ e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
//Added By Poonam B[21/11/2019][START]
finally
{
if(isProcessStarted)
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Over for Site:" + siteCodeFr;
}
else
{
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
// Removed logwriter argument as class level defined
//gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
}
}
//Added By Poonam B[21/11/2019][END]
return errorCode;
}
......@@ -677,9 +802,9 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
hrLogWriter.setLineNo(logwriterDb.getLineNo());
hrLogWriter.setObjName(logwriterDb.getObjName());
if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
if(hrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
{
hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
//hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
hrLogWriter.setTransactionCreatedBy("caller");
}
......@@ -720,12 +845,15 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
}
catch (Exception e)
{
System.out.println("PayrollSinglePrc.gbf_set_log_properties_by_caller()" + e);
System.out.println("Exception in PayrollSinglePrc.gbf_set_log_properties_by_caller()" + e);
e.printStackTrace();
}
System.out.println("PayrollSinglePrc.gbf_set_log_properties_by_caller()======= Completed");
}
public int gbfReleaseLogWriter(Document headerDom, HRLogWriter hrLogWriter, Connection logConn) throws ITMException
// Removed logwriter argument as class level defined
// public int gbfReleaseLogWriter(Document headerDom, HRLogWriter hrLogWriter, Connection logConn) throws ITMException
public int gbfReleaseLogWriter(Document headerDom, Connection logConn) throws ITMException
{
int liRet = 1;
String lsLogStr = "", frEmp = "", toEmp = "", fromPrd = "", toPrd = "", frSite = "", toSite = "", mtype = "";
......@@ -766,18 +894,18 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
rowsProcessed = hrLogWriter.getRowsProcessed();
rowsRejected = hrLogWriter.getRowsRejected();
System.out.println("rowsProcessed==>" + rowsProcessed + " rowsRejected==>" + rowsRejected);
lsLogStr = "Total Employees: " + String.valueOf(rowsProcessed + rowsRejected) + " Processed: " + rowsProcessed
//Commented By Poonam B[21/11/2019][START]
/*lsLogStr = "Total Employees: " + String.valueOf(rowsProcessed + rowsRejected) + " Processed: " + rowsProcessed
+ " Rejected: " + rowsRejected;
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I",logConn);
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I",logConn);*/
//Commented By Poonam B[21/11/2019][END]
if (frSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase()))
{
lsLogStr = "Processing Over for Site: " + frSite;
lsLogStr = "Complete Payroll Processing Over for Site: " + frSite;
}
else
{
lsLogStr = "Processing Over for Sites between: " + frSite + " To: " + toSite;
lsLogStr = "Complete Payroll Processing Over for Sites between: " + frSite + " To: " + toSite;
}
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I",logConn);
}
......@@ -788,27 +916,29 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
}
return liRet;
}
// Commented By Poonam B[25/11/2019][method has never used anywhere][START]
/*
public HRLogWriter gbfServeLogPropertiesToCaller ()
{
return hrLogWriter;
}
public void gbfSetLogpropertiesFromTarget ()
{
HRLogWriter logWriter = gbfServeLogPropertiesToCaller();
hrLogWriter.setLineNo(logWriter.getLineNo());
}
public void gbfSetLogPropertiesFromTarget()
public void gbfSetLogPropertiesFromTarget()
{
HRLogWriter logWriter = gbfServeLogPropertiesToCaller();
hrLogWriter.setLineNo(logWriter.getLineNo());
}
*/
// Commented By Poonam B[25/11/2019][method has never used anywhere][END]
private String checkNull(String input)
{
return input == null ? "" : input;
}
}
}
\ No newline at end of file
......@@ -42,12 +42,55 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
ArrayList<Timestamp> fromDates = new ArrayList<Timestamp>();
ArrayList<Timestamp> toDates = new ArrayList<Timestamp>();
String cPaySite = "", cPayTable = "", cFinEnt = "";
String isCaller = "SELF";
String isLogLocationType = "N";
String popstat = "N", arrgen = "N", isOwrite = "N";
String isFilename = "c:\\appl\\itm26\\pay_err.log", isPayarrProc = "N";
String isSingle = "N", isItaxproc = "N";
String isProcId = "PayrollProcess";
String popstat = "N", arrgen = "N";
String isLogLocationType = "N";
String isPayarrProc = "N" , isItaxproc = "N";
// Added by Poonam B [21/11/2019][START]
private String isCaller = "SELF";
private String isOwrite = "N";
private String isFilename = "c:\\appl\\itm26\\pay_err.log";
private String isSingle = "N";
private String isProcId = "PayrollProcess";
public String getIsCaller() {
return isCaller;
}
public void setIsCaller(String isCaller) {
this.isCaller = isCaller;
}
public String getIsOwrite() {
return isOwrite;
}
public void setIsOwrite(String isOwrite) {
this.isOwrite = isOwrite;
}
public String getIsFilename() {
return isFilename;
}
public void setIsFilename(String isFilename) {
this.isFilename = isFilename;
}
public String getIsSingle() {
return isSingle;
}
public void setIsSingle(String isSingle) {
this.isSingle = isSingle;
}
public String getIsProcId() {
return isProcId;
}
public void setIsProcId(String isProcId) {
this.isProcId = isProcId;
}
//Added by Poonam B [21/11/2019][END]
String idSetDateStr = "";
Timestamp idStatusDate = null, lDate = null;
String runMode = "V";
......@@ -147,12 +190,13 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
System.out.println("returning from Process "+resString);
return resString;
}
public String gbfProcessPayroll(Document dom, Document dom1, String xtraParams, HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws ITMException
//Modified by Poonam B [25/11/2019][START]
// Change argument name of hrlogwriter
// public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
public String gbfProcessPayroll(Document dom, Document dom1, String xtraParams, HRLogWriter hrLogWriterArg, Connection conn, Connection logConn) throws ITMException, Exception
{
//Modified by Poonam B [25/11/2019][END]
//String chgTerm = "", loginSite = "", userId = "";
//Added By Poonam B[18/10/2019][START][To avoid null pointer exception]
this.hrLogWriter = hrLogWriter;
//Added By Poonam B[18/10/2019][END][To avoid null pointer exception]
String empCodeFr = "", empCodeTo = "", fromSite = "", toSite = "", procGroupFr = "", procGroupTo = "", prdCodeFr = "", prdCodeTo = "",
prdCodeArr = "", considerAttd = "", dataOWrite = "", payrollDateStr = "", type = "", isConsiderAttd = "", errorString = "";
int totPrd = 0;
......@@ -206,6 +250,10 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
double calcDays = 0d;
try
{
//Added By Poonam B[18/10/2019][START][To avoid null pointer exception]
hrLogWriter = hrLogWriterArg; // Assigned argument to class level variable
//Added By Poonam B[18/10/2019][END][To avoid null pointer exception]
/*userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));*/
......@@ -259,7 +307,7 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
}
if(totPrd <= 0)
{
errorCode = "VPPAYPROC01"; // Nom Period code specified for processing
errorCode = "VPPAYPROC01"; // Nom Period code specified for processing
return errorCode;
}
if(utilMethods.pos("!ENCCALC!SINGLE!CAP!CHANGEARREARSPROCESS!", "!" + isCaller.trim().toUpperCase() + "!") == 0)
......@@ -1754,7 +1802,10 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
conn.rollback();
}
catch(Exception e1){}
throw new ITMException(e);
//Modified By Poonam B[25/11/2019][To avoid string literal too long error][START]
//throw new ITMException(e);
throw new Exception(e);
//Modified By Poonam B[25/11/2019][To avoid string literal too long error][END]
}
finally
{
......@@ -3539,25 +3590,16 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
}
public boolean gbfJobTerminateRequested (Connection conn) throws ITMException, SQLException
{
try
System.out.println("Calling gbfJobTerminateRequested (Connection conn) of PayrollSplitgenAccPrc");
if(hrLogWriter.gfJobterminateRequested(hrLogWriter.getJobID(),conn))
{
System.out.println("Calling gbfJobTerminateRequested (Connection conn) of PayrollSplitgenAccPrc");
if(hrLogWriter.gfJobterminateRequested(hrLogWriter.getJobID(),conn))
{
hrLogWriter.setJobTerminateRequested("Y");
return true;
}
else
{
return false;
}
hrLogWriter.setJobTerminateRequested("Y");
return true;
}
catch(Exception e)
else
{
System.out.println("Exception in gbfJobTerminateRequested............");
return false;
}
}
public String gbfLoanInst(String empCode, String currPrd, String procType, Timestamp ldEffDate, Timestamp ldExpDate, String xtraParams, Connection conn, Connection logConn) throws ITMException
{
......@@ -4209,7 +4251,7 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
if(hrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
{
hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
//hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
hrLogWriter.setTransactionCreatedBy("caller");
}
......@@ -4251,7 +4293,8 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
}
}
public HRLogWriter gbfServeLogPropertiesToCaller ()
// Commented By Poonam B[25/11/2019][method has never used anywhere][START]
/*public HRLogWriter gbfServeLogPropertiesToCaller ()
{
return hrLogWriter;
}
......@@ -4260,8 +4303,9 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
{
HRLogWriter logWriter = gbfServeLogPropertiesToCaller();
hrLogWriter.setLineNo(logWriter.getLineNo());
}
}*/
// Commented By Poonam B[25/11/2019][method has never used anywhere][END]
private void closeResources(PreparedStatement pstmt,ResultSet rs)
{
try{
......
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