Skip to content

B
business-java
Commit 6add50f8 authored by pbhosale's avatar pbhosale
Browse files
Options

Updated on [12-12-2019] 

AdmCommon.java
AllowDednSalComp.java
PayrollSinglePrc.java
PayrollSplitgenAccPrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213468 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bd3fdf17
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 27 deletions
webitm-adm/src/ibase/webitm/ejb/adm/AdmCommon.java
View file @ 6add50f8
......@@ -6762,7 +6762,8 @@ public class AdmCommon
}
}
}
if (rs != null)
//Modified by Poonam B[11-12-2019][To avoid null Pointer in loop][START]
/*if (rs != null)
{
rs.close();
rs = null;
......@@ -6771,12 +6772,25 @@ public class AdmCommon
{
pstmt.close();
pstmt = null;
}
}*/
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
//Modified by Poonam B[11-12-2019][To avoid null Pointer in loop][END]
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("Exception in gfGetSlabAmt "+e);
throw new ITMException(e);
}
finally
......
webitm-adm/src/ibase/webitm/ejb/adm/AllowDednSalComp.java
View file @ 6add50f8
......@@ -7,6 +7,9 @@ HashMap payCompInfo = new HashMap();
package ibase.webitm.ejb.adm;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.lang.reflect.Array;
import java.sql.Connection;
import java.sql.Date;
......@@ -23,6 +26,11 @@ import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.ITMException;
......@@ -37,7 +45,8 @@ public class AllowDednSalComp
ArrayList<String> pbToJavaSyntaxKeyList = new ArrayList<String>();
int pbToJavaSyntaxKeySize = 0;
Connection admCommonConn = null;
private String convertFormulaInJava(String input, Connection conn) throws ITMException
E12GenericUtility genericUtility = new E12GenericUtility();
/*private String convertFormulaInJava(String input, Connection conn) throws ITMException
{
try
{
......@@ -66,16 +75,16 @@ public class AllowDednSalComp
{
continue;
}
/*syntaxKeyStr[0].replace("{", "");
syntaxKeyStr[0].replace("{", "");
syntaxKeyStr[0].replace("}", "");
syntaxKeyStr[1].replace("{", "");
syntaxKeyStr[1].replace("}", "");*/
syntaxKeyStr[1].replace("}", "");
syntaxKeyStr[1] = syntaxKeyStr[1].replace("{", "");
syntaxKeyStr[1] = syntaxKeyStr[1].replace("}", "");
syntaxKeyStr[2]= syntaxKeyStr[2].replace("{", "");
syntaxKeyStr[2] = syntaxKeyStr[2].replace("}", "");
/*pbSyntaxKeyList.add(syntaxKeyStr[0]);
pbToJavaSyntaxKeyList.add(syntaxKeyStr[1]);*/
pbSyntaxKeyList.add(syntaxKeyStr[0]);
pbToJavaSyntaxKeyList.add(syntaxKeyStr[1]);
pbSyntaxKeyList.add(syntaxKeyStr[1]);
pbToJavaSyntaxKeyList.add(syntaxKeyStr[2]);
pbToJavaSyntaxKeySize = pbSyntaxKeyList.size();
......@@ -98,9 +107,78 @@ public class AllowDednSalComp
throw new ITMException(e);
}
return input;
}
}*/
//Modified By Poonam B[20/11/2019][START][New methods created to convert formula in java syntax with dynamic concept].End
//Added by Varsha V on 02-12-19 to change pb formula to java using xml
private String convertFormulaInJava(String input, Connection conn) throws ITMException
{
String isCurrentLine = "", childNodeName = "", childNodeValue = "";
StringBuffer xmlFileData = new StringBuffer();
NodeList parentNodeList = null, childNodeList = null;
Node parentNode = null, childNode = null;
ArrayList<String> pbSyntaxKeyList = new ArrayList<String>();
ArrayList<String> pbToJavaSyntaxKeyList = new ArrayList<String>();;
try
{
if (pbToJavaSyntaxKeySize == 0)
{
pbToJavaSyntaxKeySize = -1;
String filePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default" + File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war" + File.separator + "setting" + File.separator +"ADCompFormulaSyntax.xml";
BufferedReader bufferedReader = new BufferedReader(new FileReader(filePath));
while ((isCurrentLine = bufferedReader.readLine()) != null)
{
if (isCurrentLine.trim().length() > 0)
{
xmlFileData.append(isCurrentLine.trim());
}
}
String xmlMetadata = xmlFileData.toString().replace("//", "").trim();
xmlMetadata = xmlMetadata.replace('"', ' ').trim();
System.out.println("xmlMetadata:: ["+xmlMetadata+"]");
Document domInitData = genericUtility.parseString(xmlMetadata);
parentNodeList = domInitData.getElementsByTagName("syntax");
for(int i = 0; i<parentNodeList.getLength(); i++)
{
parentNode = parentNodeList.item(i);
childNodeList = parentNode.getChildNodes();
for(int j = 0; j<childNodeList.getLength(); j++)
{
childNode = childNodeList.item(j);
childNodeName = childNode.getNodeName();
childNodeValue = childNode.getTextContent();
if( "pb".equalsIgnoreCase( childNodeName ) )
{
System.out.println("PB code: "+childNodeValue);
pbSyntaxKeyList.add(childNodeValue);
}
else if( "java".equalsIgnoreCase( childNodeName ) )
{
System.out.println("JAVA code: "+childNodeValue);
pbToJavaSyntaxKeyList.add(childNodeValue);
}
}
}
System.out.println("pbSyntaxKeyList::: "+pbSyntaxKeyList);
System.out.println("pbToJavaSyntaxKeyList::: "+pbToJavaSyntaxKeyList);
}
pbToJavaSyntaxKeySize = pbSyntaxKeyList.size();
if(pbToJavaSyntaxKeySize > 0)
{
for (int i = 0; i < pbToJavaSyntaxKeySize; i++)
{
String pbKeyStr = (String) pbSyntaxKeyList.get(i);
String javaKeyStr = (String) pbToJavaSyntaxKeyList.get(i);
input = input.replace(pbKeyStr, javaKeyStr);
}
}
}
catch(Exception e)
{
throw new ITMException(e);
}
return input;
}
//Ended by Varsha V on 02-12-19 to change pb formula to java using xml
private String replaceIF(String input) throws ITMException
{
try
......
webitm-adm/src/ibase/webitm/ejb/adm/PayrollSinglePrc.java
View file @ 6add50f8
......@@ -85,10 +85,14 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
hrLogWriter.setActivity("Complete Process");
//Modified By Poonam B[11-12-2019][START]
//hrLogWriter.setActivity("Complete Process");
hrLogWriter.setActivity("CompleteProcess");
activity = hrLogWriter.getActivity();
hrLogWriter.setProcessId("Complete Payroll Process");
//hrLogWriter.setProcessId("Complete Payroll Process");
hrLogWriter.setProcessId("CompletePayrollProcess");
hrLogWriter.setFileNameStartWith("COMPPAYPROC_");
//Modified By Poonam B[11-12-2019][END]
fileNameStartWith = hrLogWriter.getFileNameStartWith();
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, activity, fileNameStartWith, loginSite, logConn);
retErrStr = gbfProcess(headerDom, detailDom, windowName, xtraParams, hrLogWriter, conn,logConn);
......@@ -98,7 +102,8 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
conn.rollback();
System.out.println("Connection has been rollback..!!!!!");
retStr = itmDBAccessEJB.getErrorString("", retErrStr, userId, "", logConn);
hrLogWriter.gbfErrWrite("","", "", retErrStr,"", logConn);
System.out.println("retStr :::::" +retStr);
//hrLogWriter.gbfErrWrite("","", "", retErrStr,"E", logConn);
}
else
{
......@@ -210,7 +215,10 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
valueXmlStr = valueXmlString.toString();
do
{
hrLogWriter.setCurrentProcess("COMPLETEPROCESS");
//Modified By Poonam B[11-12-2019][START]
//hrLogWriter.setCurrentProcess("COMPLETEPROCESS");
hrLogWriter.setCurrentProcess("CompleteProcess");
//Modified By Poonam B[11-12-2019][END]
//interestProcessConfPrc.isSingle = "Y";
interestProcessConfPrc.setIsSingle("Y");
//payrollSplitgenAccPrc.isCaller = "SINGLE";
......@@ -259,15 +267,16 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
// Removed logwriter argument as class level defined
//gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
//gbfReleaseLogWriter(headerDom, conn);
return errorCode;
}
else
{
lsFileName = hrLogWriter.getLogFileName();
System.out.println("Log File name::::: " +lsFileName);
isProcId = hrLogWriter.getProcessId();
System.out.println("process Id name::::: " +isProcId);
//Modified By Poonam B [21/11/2019][START]
//interestProcess.isLogFileName = lsFileName;
interestProcess.setIsLogFileName(lsFileName);
......@@ -328,7 +337,8 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
if(errorCode != null && errorCode.trim().length() > 0)
{
if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
//Modified by Poonam B[12-12-2019][START]
/*if (siteCodeFr.trim().toUpperCase().equalsIgnoreCase(siteCodeTo.trim().toUpperCase()))
{
lsLogStr = "Complete Payroll Processing Over for Site: " + siteCodeFr;
}
......@@ -336,11 +346,13 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
{
lsLogStr = "Complete Payroll Processing Over for Sites between: " +siteCodeFr+ " To:" +siteCodeTo;
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);*/
// Removed logwriter argument as class level defined
//gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
return errorCode;
//gbfReleaseLogWriter(headerDom, conn);
//return errorCode;
break;
//Modified by Poonam B[12-12-2019][END]
}
}
// -------------- InterestProcessConfPrc.java--------------------------
......@@ -392,8 +404,13 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
System.out.println("errorCode from interestProcessConfPrc::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
//Added by Poonam B[12-12-2019][START][to show error in log]
lsLogStr = admCommon.getErrorMessage(e, "");
System.out.println("lsLogStr inside catch block" +lsLogStr);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, "" , lsLogStr, "E",logConn);
//Added by Poonam B[12-12-2019][END][to show error in log]
}
// Commented By Poonam B[25/11/2019][method has never use][START]
//gbfSetLogPropertiesFromTarget();
......@@ -458,9 +475,15 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
System.out.println("errorCode from payrollSplitgenAccPrc::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
//Added by Poonam B[12-12-2019][START][to show error in log]
lsLogStr = admCommon.getErrorMessage(e, "");
System.out.println("lsLogStr inside catch block" +lsLogStr);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, "" , lsLogStr, "E",logConn);
//Added by Poonam B[12-12-2019][END][to show error in log]
}
System.out.println("Current Process is::" +hrLogWriter.getCurrentProcess());
// 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]
......@@ -541,9 +564,15 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
System.out.println("errorCode from payrollArrearsProcessingPrc::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
}
//Added by Poonam B[12-12-2019][START][to show error in log]
lsLogStr = admCommon.getErrorMessage(e, "");
System.out.println("lsLogStr inside catch block" +lsLogStr);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, "" , lsLogStr, "E",logConn);
//Added by Poonam B[12-12-2019][END][to show error in log]
}
System.out.println("Current Process is::" +hrLogWriter.getCurrentProcess());
// 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]
......@@ -612,13 +641,20 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
try
{
errorCode = payrollSplitgenAccPrc.gbfProcessPayroll(arrHeaderDom, arrHeaderDom, xtraParams, hrLogWriter, conn, logConn);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
System.out.println("errorCode from payrollSplitgenAccPrc_1::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
//Added by Poonam B[12-12-2019][START][to show error in log]
lsLogStr = admCommon.getErrorMessage(e, "");
System.out.println("lsLogStr inside catch block" +lsLogStr);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, "" , lsLogStr, "E",logConn);
//Added by Poonam B[12-12-2019][END][to show error in log]
}
System.out.println("Current Process is::" +hrLogWriter.getCurrentProcess());
// 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]
......@@ -692,9 +728,15 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
catch(Exception e)
{
e.printStackTrace();
System.out.println("errorCode::::"+e.getMessage().toString());
System.out.println("errorCode from payrollSplitgenAccPrc_2::::"+e.getMessage().toString());
errorCode = "ERROR~t" +e.getMessage().toString();
//Added by Poonam B[12-12-2019][START][to show error in log]
lsLogStr = admCommon.getErrorMessage(e, "");
System.out.println("lsLogStr inside catch block" +lsLogStr);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, "" , lsLogStr, "E",logConn);
//Added by Poonam B[12-12-2019][END][to show error in log]
}
System.out.println("Current Process is::" +hrLogWriter.getCurrentProcess());
// 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]
......@@ -735,6 +777,7 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
}
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);*/
System.out.println("errorCode inside try block:::" +errorCode);
}
catch (Exception e)
{
......@@ -743,6 +786,11 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
System.out.println("Exception :PayrollSinglePrc :process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn):"
+ e.getMessage() + ":");
e.printStackTrace();
//Added by Poonam B[11-12-2019][to give error in server log][START]
lsLogStr = admCommon.getErrorMessage(e, "");
System.out.println("lsLogStr inside catch block" +lsLogStr);
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "E",2,logConn);
//Added by Poonam B[11-12-2019][to give error in server log][END]
throw new ITMException(e);
}
//Added By Poonam B[21/11/2019][START]
......@@ -761,7 +809,7 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
hrLogWriter.gbfErrWrite("", "", "", lsLogStr, "I",logConn);
// Removed logwriter argument as class level defined
//gbfReleaseLogWriter(headerDom, hrLogWriter, conn);
gbfReleaseLogWriter(headerDom, conn);
//gbfReleaseLogWriter(headerDom, conn);
}
}
//Added By Poonam B[21/11/2019][END]
......
webitm-adm/src/ibase/webitm/ejb/adm/PayrollSplitgenAccPrc.java
View file @ 6add50f8
......@@ -926,7 +926,9 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
payrollDataMap.put("GRADE", cGrade);
payrollDataMap.put("CADRE", cCadre);
payrollDataMap.put("BASIC_AMT", cBasic);
//Added By Poonam B[11-12-2019][START]
payrollDataMap.put("PROC_TYPE", type);
//Added By Poonam B[11-12-2019][END]
mTotDays = gbfGetProp(prdItem, empCode, xtraParams, conn);
if(mTotDays < 0)
{
......@@ -1854,6 +1856,17 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
closeResources(pstmt22, null);
closeResources(pstmt23, null);
System.out.println("Finally Executed......");
//Added By Poonam B[12-12-2019][START]
if (fromSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase()))
{
lsLogStr = "Processing Over for Site: " + fromSite;
}
else
{
lsLogStr = "Processing Over for Sites between: " + fromSite + " To: " + toSite;
}
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I",logConn);
//Added By Poonam B[12-12-2019][END]
}catch(Exception se){}
}
return errorCode;
......
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