Skip to content

B
business-java
Commit cfcb43e7 authored by akhokar's avatar akhokar
Browse files
Options

Changes done to shift initialize hrlogWriter in main method. 

PayrollPostAccPrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@208287 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1ccad279
Show whitespace changes
Inline Side-by-side
Showing with 422 additions and 169 deletions
webitm-adm/src/ibase/webitm/ejb/adm/PayrollPostAccPrc.java
View file @ cfcb43e7
......@@ -17,7 +17,6 @@ import org.w3c.dom.NodeList;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.bean.adm.LogWriterDatabase;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.adm.adv.LogWriter;
......@@ -38,6 +37,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
AdmCommon admCommon = new AdmCommon();
UtilMethods utilMethod = new UtilMethods();
FinCommon finCommon = new FinCommon();
HRLogWriter hrLogWriter = new HRLogWriter();
PayrollVoucherConf PayrollVoucherConf = new PayrollVoucherConf();
LogWriter log = new LogWriter();
int rowCount = 0, rowcnt = 0;
......@@ -52,6 +52,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
String retStr = "";
Connection conn = null;
Connection logConn = null;
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
String objName = "";
String jobId = "";
String activity = "",processId = "",fileNameStartName = "";
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
try
{
conn = getConnection();
......@@ -68,7 +73,29 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
detailDom = genericUtility.parseString(xmlString2);
System.out.println("detailDom ["+detailDom+"]");
}
retStr = process(headerDom, detailDom, windowName, xtraParams, conn,logConn);
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
jobId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "job_id"));
objName = getObjNameFromDom(headerDom, "objName");
System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
hrLogWriter.setLogLineNo(0);
hrLogWriter.setTotalRows(0);
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
hrLogWriter.setObjName(objName);
hrLogWriter.setJobIdCreated(false);
hrLogWriter.setActivity("PayrollPosting");
hrLogWriter.setProcessId("PayrollPosting");
hrLogWriter.setFileNameStartWith("PAYPROC");
activity = hrLogWriter.getActivity();
processId = hrLogWriter.getProcessId();
fileNameStartName = hrLogWriter.getFileNameStartWith();
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, activity, fileNameStartName, loginSite, logConn);
retStr = process(headerDom, detailDom, windowName, xtraParams,hrLogWriter, conn,logConn);
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
System.out.println("Process for PayrollPostAccPrc :::: " + retStr);
}
catch (Exception e)
......@@ -104,9 +131,16 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return retStr;
}// END OF PROCESS
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
{
LogWriterDatabase logWriter = new LogWriterDatabase();
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//LogWriterDatabase logWriter = new LogWriterDatabase();
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//HRLogWriter hrLogWriter = new HRLogWriter();
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
UserInfoBean userinfo = new UserInfoBean();
ResultSet rs = null, rs1 = null;
PreparedStatement pstmt = null, pstmt1 = null;
......@@ -134,18 +168,31 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
double advalb, rndto, allwamt, dednamt, mamount, lamount, mrndamt, retval, mtotdays;
boolean isError = false;
int liRet = 0;
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//String jobId = "";
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
try
{
System.out.println("Inside process method.......");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//jobId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "job_id"));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
map = new HashMap();
headerRowMap = new HashMap();
gbflogWriterMap = new HashMap();
objName = getObjNameFromDom(headerDom, "objName");
System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
logWriter.setCurrentProcess("PayrollPosting");
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*objName = getObjNameFromDom(headerDom, "objName");
System.out.println("objName coming from getObjNameFromDom method:::: " + objName);*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*logWriter.setCurrentProcess("PayrollPosting");
logWriter.setActivity("PayrollPosting");
logWriter.setProcessId("PayrollPosting");
logWriter.setFileNameStartWith("PAYPROC");
......@@ -161,41 +208,87 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
gbflogWriterMap.put("loginSite", loginSite);
gbflogWriterMap.put("xtraParams", xtraParams);
gbflogWriterMap.put("fileNameStartName", fileNameStartName);
logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn);
logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn);*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*hrLogWriter.setLogLineNo(0);
hrLogWriter.setTotalRows(0);
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
hrLogWriter.setObjName(objName);
hrLogWriter.setJobIdCreated(false);
hrLogWriter.setJobTerminateRequested("N");*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
hrLogWriter.setCurrentProcess("PayrollPosting");
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*hrLogWriter.setActivity("PayrollPosting");
hrLogWriter.setProcessId("PayrollPosting");
hrLogWriter.setFileNameStartWith("PAYPROC");*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
currentProcess = hrLogWriter.getCurrentProcess();
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*activity = hrLogWriter.getActivity();
processId = hrLogWriter.getProcessId();
fileNameStartName = hrLogWriter.getFileNameStartWith();
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, activity, fileNameStartName, loginSite, logConn);*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K. on [27-July-2019][To show error msg coming from method][Start]
errorCode = logWriter.getReturnUpdError();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//errorCode = logWriter.getReturnUpdError();
errorCode = hrLogWriter.getReturnUpdError();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if(errorCode != null && errorCode.trim().length() > 0)
{
errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn);
return errString;
}
//Modified by Azhar K. on [27-July-2019][To show error msg coming from method][End]
liRet = logWriter.getlogWriterFlag();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//liRet = logWriter.getlogWriterFlag();
liRet = hrLogWriter.getLogWriterFlag();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if(liRet >= 0)
{
lsType = checkNull(genericUtility.getColumnValue("type", headerDom));
logWriter.setStatusType("I");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter.setStatusType("I");
hrLogWriter.setStatusType("I");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if("PP".equalsIgnoreCase(lsType))
{
logWriter.setCurrentProcess("Payroll Posting");
logWriter.setActivity("PayrollPosting");
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*logWriter.setCurrentProcess("Payroll Posting");
logWriter.setActivity("PayrollPosting");*/
hrLogWriter.setCurrentProcess("Payroll Posting");
hrLogWriter.setActivity("PayrollPosting");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
lsLogMsg = "Payroll Posting Process Started";
}
else
{
logWriter.setCurrentProcess("Arrears Posting");
logWriter.setActivity("ArrearsPosting");
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*logWriter.setCurrentProcess("Arrears Posting");
logWriter.setActivity("ArrearsPosting");*/
hrLogWriter.setCurrentProcess("Arrears Posting");
hrLogWriter.setActivity("ArrearsPosting");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
lsLogMsg = "Arrears Posting Process Started";
}
logWriter.setlogWriterFlag(liRet);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter.setlogWriterFlag(liRet);
hrLogWriter.setLogWriterFlag(liRet);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
}
System.out.println("logWriter value coming from initializeLogWriter:::: " + logWriter);
liFile = logWriter.getlogWriterFlag();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*System.out.println("logWriter value coming from initializeLogWriter:::: " + logWriter);
liFile = logWriter.getlogWriterFlag();*/
liFile = hrLogWriter.getLogWriterFlag();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("liFile:::: " + liFile);
if (liFile < 0)
{
gbfReleaseLogWriter(headerDom, logWriter, logConn);
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
// return is_errxml
}
......@@ -249,8 +342,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lslogStr = "Processing Started for Sites between: " + SiteCodeFrom + " To: " + SiteCodeTo;
}
logWriter = admCommon.gbfErrWrite("", "", mtype, lslogStr, "I",logWriter,logConn);
errorCode = logWriter.getReturnUpdError();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*logWriter = admCommon.gbfErrWrite("", "", mtype, lslogStr, "I",logWriter,logConn);
errorCode = logWriter.getReturnUpdError();*/
hrLogWriter.gbfErrWrite("", "", mtype, lslogStr, "I", logConn);
errorCode = hrLogWriter.getReturnUpdError();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if(errorCode != null && errorCode.trim().length() > 0)
{
errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn);
......@@ -259,8 +356,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
totPrds = gbfGetPeriods(PrdCodeFrom, PrdCodeTo, conn);
System.out.println("totPrds coming from gbfGetPeriods function is:::::: " + totPrds);
if (totPrds == 0)
{
gbfReleaseLogWriter(headerDom, logWriter, logConn);
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
return ""; // periods not proper.
}
......@@ -381,7 +480,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rowCount == 0)
{
errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
return errString;
}
......@@ -490,13 +592,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rowCount == 0)
{
errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
return errString;
}
}
postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,logWriter, conn,logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,logWriter, conn,logConn);
postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,hrLogWriter, conn,logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("postPayrollStr :::: " + postPayrollStr);
//Modified by Azhar K. on[09-05-2019][To display error messages on browser][Start]
errString = postPayrollStr;
......@@ -510,7 +617,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "VPPAPOST01", userId, "", conn);
}
}
gbfReleaseLogWriter(headerDom, logWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} // try end
catch (Exception e)
{
......@@ -545,7 +655,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return errString;
}// END OF PROCESS
public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,LogWriterDatabase logWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,LogWriterDatabase logWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,HRLogWriter hrLogWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
{
String thiswin = "", keyString = "", bankCodeEnv = "", autoPay = "", payMode = "", autoPost = "";
String autoPostEnv = "", autoPostSenv = "", empCode = "", deptCode = "", prdCode = "";
......@@ -631,7 +744,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VTSEQ", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTSEQ", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTSEQ", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTSEQ", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
......@@ -677,7 +793,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -690,7 +809,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -701,7 +823,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -712,7 +837,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -726,7 +854,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -737,7 +868,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -752,7 +886,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString;
}
......@@ -920,15 +1057,21 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rowMap = (HashMap) headerMap.get(i);
System.out.println("rowMap:::: " + i + " = " + rowMap);
jobId = logWriter.getJobID();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//jobId = logWriter.getJobID();
jobId = hrLogWriter.getJobID();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("jobId:::: " + jobId);
if(jobId != null && jobId.trim().length() > 0)
{
if(admCommon.gfJobTerminateRequested(jobId ,logConn))
{
logWriter.setJobTerminateRequested("Y");
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter.setJobTerminateRequested("Y");
hrLogWriter.setJobTerminateRequested("Y");
logWriter = admCommon.gbfErrWrite(prdCodeStr , "" , mtype ," - Process Terminated on request" , "I",logWriter,logConn) ;
//logWriter = admCommon.gbfErrWrite(prdCodeStr , "" , mtype ," - Process Terminated on request" , "I",logWriter,logConn) ;
hrLogWriter.gbfErrWrite(prdCodeStr, "", mtype, " - Process Terminated on request", "I", logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
}
......@@ -967,7 +1110,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs = null;
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
if(rs != null)
......@@ -995,7 +1141,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs = null;
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
if(rs != null)
......@@ -1147,7 +1296,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
......@@ -1234,7 +1386,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "VMBANK1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2, conn);
......@@ -1290,7 +1445,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if("ERROR".equalsIgnoreCase(payVoucId) || payVoucId == null || payVoucId.trim().length() == 0)
{
errString = itmDBAccessEJB.getErrorString("","VTTRANID", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTTRANID", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTTRANID", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTTRANID", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
break;
}
......@@ -1343,7 +1501,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1406,7 +1567,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1452,7 +1616,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
|| "NULLFOUND".equalsIgnoreCase(lsFpfBaseLimit) || Long.parseLong(lsFpfBaseLimit) == 0)
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, conn);
......@@ -1473,7 +1640,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ("NULLFOUND".equalsIgnoreCase(lsFpfEligAdcode))
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
......@@ -1503,7 +1673,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1541,7 +1714,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1588,7 +1764,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1627,7 +1806,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1666,7 +1848,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1705,7 +1890,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1775,7 +1963,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1803,14 +1994,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
conn.commit();
}
logWriter = (admCommon.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype,"VTEMPFPF01", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype,"VTEMPFPF01", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype, "VTEMPFPF01", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
}
else
{
//gbf_err_write(ls_prd_str, mempcode, mtype, "VTEMPFPF01" , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
}
continue;
}
......@@ -1856,7 +2052,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -1886,14 +2085,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
// gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
}
else
{
//gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
}
continue;
}
......@@ -1913,7 +2117,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn);
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
}
......@@ -1921,7 +2128,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn);
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
//Modified by Azhar K. on[18-July-2019][Changed variable errString to errCode to flash message when period status is not defined][End]
......@@ -2002,7 +2212,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -2044,7 +2257,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][End]
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
......@@ -2105,7 +2321,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if(updatePayCnt < 0)
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
......@@ -2122,7 +2341,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS", userId, "", conn);
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
......@@ -2135,7 +2357,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (cntUpdateRows != 1)
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
......@@ -2158,7 +2383,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
//ls_errcode = nvo_payr_voucher.gbf_retrieve_payr_vou(mtranid, mtranid, 1, mtrantype, mtrantype, mbatch,msiteac)
errString = checkNull(PayrollVoucherConf.confirm(payVoucId, xtraParams, conn));
// System.out.println("errString7---["+errString+"]");
// System.out.println("errString7---["+errString+"]");
if (errString != null && errString.trim().length() > 0)
{
......@@ -2170,7 +2395,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][End]
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
}
}
......@@ -2195,7 +2423,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -2262,7 +2493,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -2281,7 +2515,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ((lcPayrollTot + lcArrearTot) != lcPayarrTot)
{
errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2, conn);
......@@ -2290,7 +2527,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (errString == null || errString.trim().length() == 0)
{
// gbf_err_write(ls_prd_str , mempcode , mtype , " - Process Completed" , "I" ,1) need to change
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1,logWriter, logConn));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
conn.commit();
}
else
......@@ -4267,7 +4507,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return retdate;
}
public int gbfReleaseLogWriter(Document headerDom, LogWriterDatabase logWriter, Connection logConn) throws ITMException
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//public int gbfReleaseLogWriter(Document headerDom, LogWriterDatabase logWriter, Connection logConn) throws ITMException
public int gbfReleaseLogWriter(Document headerDom, HRLogWriter hrLogWriter, Connection logConn) throws ITMException
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
{
int liRet = 1;
String lsLogStr = "", frEmp = "", toEmp = "", fromPrd = "", toPrd = "", frSite = "", toSite = "", mtype = "",
......@@ -4306,14 +4549,21 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
mtype = checkNull(genericUtility.getColumnValue("type", headerDom));
rowsProcessed = logWriter.getRowsProcessed();
rowsRejected = logWriter.getRowsRejected();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*rowsProcessed = logWriter.getRowsProcessed();
rowsRejected = logWriter.getRowsRejected();*/
rowsProcessed = hrLogWriter.getRowsProcessed();
rowsRejected = hrLogWriter.getRowsRejected();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("rowsProcessed==>" + rowsProcessed + " rowsRejected==>" + rowsRejected);
lsLogStr = "Total Employees: " + String.valueOf(rowsProcessed + rowsRejected) + " Processed: " + rowsProcessed
+ " Rejected: " + rowsRejected;
//gbf_err_write("","",mtype,ls_log_str , "I")
logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I", logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if (frSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase()))
{
......@@ -4324,7 +4574,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lsLogStr = "Processing Over for Sites between: " + frSite + " To: " + toSite;
}
//gbf_err_write("","",mtype,ls_log_str , "I")
logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I", logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
/*if istr_log_writer.transaction_created_by = "self" then
if not isnull(istr_log_writer.transaction) and isvalid(istr_log_writer.transaction) then
......
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