Skip to content

B
business-java
Commit 50fbc544 authored by sanashaikh's avatar sanashaikh
Browse files
Options

Sana S : Modified on 18/12/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213686 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0db7022d
Show whitespace changes
Inline Side-by-side
Showing with 906 additions and 512 deletions
webitm-adm/src/ibase/webitm/ejb/adm/PerkClaimWOLoanAdjPrc.java
View file @ 50fbc544
......@@ -14,9 +14,13 @@ import java.util.HashMap;
import java.util.Map.Entry;
import javax.ejb.Stateless;
import org.w3c.dom.CDATASection;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import com.ctc.wstx.evt.WDTD;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
......@@ -421,7 +425,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
retStr = process(headerDom, detailDom, xtraParams,hrLogWriter,conn,logConn);
System.out.println("Process for PerkClaimWOLoanAdjPrc ::"+retStr);
//Modified by Sana S on 06/11/19 [start]
gbfDestructProcess(headerDom,hrLogWriter, logConn);
//gbfDestructProcess(headerDom,hrLogWriter, logConn);// Commented by Sana S on 09/12/19
//Modified by Rohini T on 29/08/19[End]
/*if ((retStr != null && retStr.trim().length() > 0) && (retStr.indexOf("Errors") != -1)) //Error
{
......@@ -481,15 +485,20 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
}
//Added by Sana S on 06/11/19 [start]
errMsg = "\n noof_confirmed are ["+hrLogWriter.getRowsProcessed()+"] \n noof_rejected are ["+hrLogWriter.getRowsRejected()+"]";
errMsg = "\r\n no.of_confirmed are ["+hrLogWriter.getRowsProcessed()+"] \r\n no.of_rejected are ["+hrLogWriter.getRowsRejected()+"]";
try {
System.out.println("errMsg>>>>>>"+errMsg);
retStr = getError(errMsg,retStr,conn);
if ((retStr != null && retStr.trim().length() > 0) && (retStr.indexOf("Errors") != -1)) //Error
System.out.println("final error string>>>>>>"+retStr);
/*if ((retStr != null && retStr.trim().length() > 0) && (retStr.indexOf("Errors") != -1)) //Error
{
isError = true;
return retStr;
}
}*/
} catch (Exception e) {
e.printStackTrace();
throw new ITMException(e);
......@@ -502,7 +511,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
public String process(Document headerDom, Document detailDom, String xtraParams,HRLogWriter hrLogWriter,Connection conn,Connection logConn) throws Exception
//Modified by Rohini T on 29/08/19[End]
{
String errMsg="";// Added by Sana S on 06/11/19
String errMsg="",lsPrevEmp1="",errorCode="";// Added by Sana S on 06/11/19
NodeList parentNodeList = null;
NodeList childNodeList = null;
Node parentNode = null;
......@@ -514,7 +523,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
java.util.Date claimDate = null;
String lsPayrollVouch = "",lsPayRollPrd = "",ldclaimDate = "", lsBankParm = "", lsPayModeParm = "", lsAdCode = "";
String errString="",childNodeName="",lsEmp = "", lsAdCd = "",userId = "", chgTerm = "";
String lsBankEnv = "",lsAd = "",lsPyrlAdclaim = "",keyString = "",sql = "",lsMonth = "";
String lsBankEnv = "",lsAd = "",lsPyrlAdclaim = "",keyString = "",lsMonth = "";
String lsEmpCode = "",lcStartDate = "",lcEndDate="",lcAdCode="",lsfullClaim = "",lsPrevEmp = " ",lsTranId = "";
String paySite = "",finEntity = "",deptCode = "",payMode = "",currCode = "",bankCode = "",acctCode = "", cctrCode = "",tranIdGenerate = "";
String lsadCodeProc = "", lsAdCodeDet = "", lsRndOff = "",lsPostYN = "",lsAdShdescr="";
......@@ -526,6 +535,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
HashMap<String, String> dwPerkProcessDet = new HashMap<String, String>();
ArrayList payDetList = new ArrayList();
HashMap payDet = null;
//added by Sana S on 12/12/19 [start]
HashMap dwPayrvHdr = new HashMap();
HashMap payDetData = new HashMap();
//added by Sana S on 12/12/19 [start]
String erroCode = "",lsAdname = "",lcBalAmtStr = "", lcClaimAmtStr = "";
int cntr = 0 , countempHdr = 0;
SimpleDateFormat sdf = null;
......@@ -543,6 +556,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Added by sana s on 18/10/19 [start]
String siteCodeFr="",siteCodeTo="";
//Added by sana s on 18/10/19 [end]
//Added by sana s on 09/12/19 [start]
String sql="",sql1="",sql2="",sql3="",sql4="",sql5="",sql6="",sql7="",sql8="",sql9="",sql10="";
String errorEmpCode="";
//Added by sana s on 09/12/19 [end]
try
{
//Added by Sana S on 05/11/19 [start]
......@@ -798,11 +815,72 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
parentNodeList = detailDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength();
System.out.println("parentNodeListLength::["+parentNodeListLength+"]");
//Modified by Sana S on 06/12/19 [start] write sql queries outside the for loop
sql1 = "select pay_site, site.fin_entity, dept_code, pay_mode, curr_code, employee.bank_code "
+ "from employee, site, finent where employee.pay_site = site.site_code and "
+ "site.fin_entity = finent.fin_entity and emp_code = ? ";
sql2 = " select acct_code, cctr_code from department where dept_code = ? ";
sql3 = "select amt_bal from allowdedn_bal where emp_code = ? and ad_code = ? and start_date = ? "
+ "and end_date = ? for update nowait";
sql4 = "select count(*) as cnt from employee_mthad where emp_code = ? and ad_code = ? "
+ "and eff_date = ? and exp_date = ?";
sql5 = "update employee_mthad set type = 'F' , amount = amount + ? , ref_type = 'C' , "
+ "ref_no = ?, prop_yn = 'N' where emp_code = ? and ad_code = ? and eff_date = ? and exp_date = ?";
sql6 = "insert into employee_mthad (emp_code, month_code, ad_code, eff_date, exp_date, type, amount,"
+ "chg_date, chg_user, chg_term, ref_type, ref_no, prop_yn) "
+ "Values(?,?,?,?,?,'F',?,?,?,?,'C',?,'N')";
sql7 = "select count(*) as count from emp_adclaimhdr where tran_id = ?";
sql8 = " insert into emp_adclaimhdr (tran_id, tran_date, emp_code, claim_amt, loan_adjamt,"
+ " payroll_voucher, prd_code__payroll, chg_date, chg_user, chg_term, ad_code,confirmed) "
+ " values (?, ?,?,0,0,?,?,?,?,?,?,'Y')";
sql9 = "update emp_adclaimhdr set claim_amt = claim_amt + ? where tran_id = ?";
sql10 = " INSERT INTO EMP_ADCLAIM (TRAN_ID, EMP_CODE, AD_CODE,"
+ " EFF_DATE, BAL_AMT, CLAIM_AMT) VALUES(?,?,?,?,?,?)";
//Modified by Sana S on 06/12/19 [end] write sql queries outside the for loop
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
{
parentNode = parentNodeList.item(selectedRow);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
System.out.println("selectedRow>>"+selectedRow);
lsPrevEmp1=lsEmpCode;//added by Sana S on 11/12/19
//added By Sana S on 11/12/19 [start] for removing data from headerHashMap,detailHashMap only if that proces has error
if("V".equalsIgnoreCase(lsPayrollVouch))
{
if(headerHashMap != null && headerHashMap.containsKey(errorEmpCode))
{
System.out.println("errorEmpCode>>>>>>>>>>>"+errorEmpCode);
dwPayrvHdr = headerHashMap.get(errorEmpCode);
System.out.println("after remove dwPayrvHdr" + dwPayrvHdr);
headerHashMap.remove(errorEmpCode,dwPayrvHdr);
payDetData = detailHashMap.get(errorEmpCode);
System.out.println("after remove payDetData" + payDetData);
detailHashMap.remove(errorEmpCode, payDetData);
System.out.println("after remove headerHashMap" + headerHashMap);
System.out.println("after remove detailHashMap" + detailHashMap);
}
}
//added By Sana S on 11/12/19 [end]
for (int childRow = 0; childRow < childNodeListLength; childRow++)
{
childNode = childNodeList.item(childRow);
......@@ -845,8 +923,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//lsfullClaim = checkNullAndTrim(genericUtility.getColumnValue("full_claim",detailDom));
}
try{lcBalAmt1 = Double.valueOf(lcBalAmtStr);}catch(Exception e) {lcBalAmt1 = 0.0;};
try{lcClaimAmt1 = Double.valueOf(lcClaimAmtStr);}catch(Exception e) {lcClaimAmt1 = 0.0;};
try{lcBalAmt1 = Double.valueOf(lcBalAmtStr); System.out.println("lcBalAmt1::"+lcBalAmt1);}catch(Exception e) {lcBalAmt1 = 0.0;};
try{lcClaimAmt1 = Double.valueOf(lcClaimAmtStr); System.out.println("lcClaimAmt1::"+lcClaimAmt1);}catch(Exception e) {lcClaimAmt1 = 0.0;};
if(lcStartDate != null && lcStartDate.trim().length() > 0)
{
......@@ -859,11 +937,76 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}//End of First For Loop
System.out.print("selectedRow11 ["+selectedRow+"] \t emp_code ["+lsEmpCode+"] \t amt_bal ["+lcBalAmt1+"] \t claim_amt ["+lcClaimAmt1+"] \t start_date ["+lcStartDate+"] ["+startDate+"] \t end_date ["+lcEndDate+"] ["+endDate+"] \t ad_code ["+lcAdCode+"] \t full_claim ["+lsfullClaim+"]" );
//Added by Sana S on 13/12/19[start] for rollback transection if process has error
if (lsPrevEmp1.equals(lsEmpCode))
{
System.out.print("equal");
if (lsEmpCode.equals(errorEmpCode))
{
System.out.print("contain error");
conn.rollback();
continue;
}
}
else
{
System.out.print("connection not commited");
if(conn != null)
{
errorCode="";
System.out.print("connection commited");
if (dwPayrvHdr.isEmpty()==false && payDetList.isEmpty()==false)
{
System.out.print("VOUCHER");
errorCode = generateVoucher(dwPayrvHdr, payDetList, lsPrevEmp1, hrLogWriter, xtraParams,
conn, logConn);
if ((errorCode != null && errorCode.trim().length() > 0)
&& (!(errorCode.contains("VPSUCC1"))))
{
System.out.print("error in voucher");
errString = itmDBAccessEJB.getErrorString("",errorCode,"","",conn);
totRejRec = totRejRec + 1;
System.out.print("totRejRec>>>>>" + totRejRec);
System.out.print("errString in voucher>>>"+errString);
//Added by Sana S for rollback connection if error is occur on 13/11/19[start]
errorEmpCode=lsPrevEmp1;
conn.rollback();
selectedRow=selectedRow-1;
lsEmpCode=lsPrevEmp1;
System.out.println("lsEmpCode voucher error"+lsEmpCode);
System.out.println("lsPrevEmp1 voucher error"+lsPrevEmp1);
dwPayrvHdr.clear();
payDetList.clear();
continue;
//Added by Sana S for rollback connection if error is occur on 13/11/19[end]
} else {
//errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
System.out.print("no error voucher");
totConfRec = totConfRec + 1;
System.out.print("totConfRec>>>>>" + totConfRec);
conn.commit();
}
//Added by Sana S on 13/12/19[end] for rollback transection if process has error
}
}
}
dwPayrvHdr = new HashMap();//Added by sarita on 26APR2019
payDetData = new HashMap();//Added by sarita on 26APR2019
payDetList=new ArrayList();//Added By Sana S on 13/12/19
//Added by Sana S on 10/12/19[end] for rollback transection if process has error
//IF BLOCK for Claim Amount and Balance Amount CHECK [START]
if(lcBalAmt1 < 0)
{
System.out.println("lcBalAmt1 checked");
if(lcClaimAmt1 > 0)
{
System.out.println("lcClaimAmt1 checked");
errString = itmDBAccessEJB.getErrorString("","VTCLAIMAM1","","",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
......@@ -871,12 +1014,19 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VTCLAIMAM1", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
// return errString; //Commented by Sana S on 09/12/19
}
else
{
if(lcClaimAmt1 < lcBalAmt1)
{
System.out.println("lcClaimAmt1<lcBalAmt1 checked");
errString = itmDBAccessEJB.getErrorString("","VTCLAIMAM2","","",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
......@@ -884,12 +1034,19 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VTCLAIMAM2", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
}
}
else if(lcClaimAmt1 > lcBalAmt1)
{
System.out.println("lcClaimAmt1>lcBalAmt1 checked");
errString = itmDBAccessEJB.getErrorString("","VTCLAIMAMT","","",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
......@@ -897,26 +1054,41 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VTCLAIMAMT", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [start]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
else if(lcClaimAmt1 < 0)
{
errString = itmDBAccessEJB.getErrorString("","VPCLMWLN03","","",conn);
System.out.println("lcClaimAmt1<0 checked");
errString = itmDBAccessEJB.getErrorString("","VPCLMWLN03",lsEmpCode,"",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
//hrLogWriter.gbfErrWrite("", "", "", "VPCLMWLN03", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VPCLMWLN03", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
//IF BLOCK for Claim Amount and Balance Amount CHECK [END]
//lsPrevEmp = lsEmpCode;
sql = "select pay_site, site.fin_entity, dept_code, pay_mode, curr_code, employee.bank_code "
+ "from employee, site, finent where employee.pay_site = site.site_code and "
+ "site.fin_entity = finent.fin_entity and emp_code = ? ";
pstmt = conn.prepareStatement(sql);
/////SQL1
pstmt = conn.prepareStatement(sql1);
pstmt.setString(1, lsEmpCode);
rs = pstmt.executeQuery();
if(rs.next())
......@@ -930,6 +1102,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
else
{
System.out.println("error generated");
errString = itmDBAccessEJB.getErrorString("","VMEMPCD","","",conn);//Claimed amount should be same as balance amount in case of full claime
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
......@@ -937,7 +1110,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VMEMPCD", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [start]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
System.out.println("pay_site ["+paySite+"] \t fin_entity ["+finEntity+"] \t dept_code ["+deptCode+"] \t pay_mode ["+payMode+"] \t curr_code ["+currCode+"] \t bank_code ["+bankCode+"]");
if(rs != null)
......@@ -951,8 +1131,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
pstmt = null;
}
sql = " select acct_code, cctr_code from department where dept_code = ? ";
pstmt = conn.prepareStatement(sql);
/////SQL2
pstmt = conn.prepareStatement(sql2);
pstmt.setString(1, deptCode);
rs = pstmt.executeQuery();
if(rs.next())
......@@ -1001,18 +1181,21 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VTTRANID", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
// return errString;//Commented by Sana S on 09/12/19
}
// [To locak allowdedn_bal table before processing as per multiple voucher case reported from Sun].Start
sql = "select amt_bal "
+ "from allowdedn_bal "
+ "where emp_code = ? "
+ "and ad_code = ? "
+ "and start_date = ? "
+ "and end_date = ? "
+ "for update nowait";
pstmt = conn.prepareStatement(sql);
/////SQL3
pstmt = conn.prepareStatement(sql3);
pstmt.setString(1,lsEmpCode);
pstmt.setString(2,lcAdCode);
pstmt.setTimestamp(3,startDate);//need to check
......@@ -1043,7 +1226,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VTCLAIMAMT", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
// return errString; //Commented by Sana S on 09/12/19
}
// [To locak allowdedn_bal table before processing as per multiple voucher case reported from Sun].End
......@@ -1057,7 +1247,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "VPCLMWOLN1", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
// return errString;//Commented by Sana S on 09/12/19
}
// Modified by Piyush on 13/02/2015 [To check the claim amount in case of full_claim = "Y"].End
......@@ -1079,13 +1276,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
if(lcTotClaimAmt != 0)
{
count = 0;
sql = "select count(*) as cnt "
+ "from employee_mthad "
+ "where emp_code = ? "
+ "and ad_code = ? "
+ "and eff_date = ? "
+ "and exp_date = ?";
pstmt = conn.prepareStatement(sql);
/////SQL4
pstmt = conn.prepareStatement(sql4);
pstmt.setString(1,lsPrevEmp);
pstmt.setString(2,lsPyrlAdclaim);
pstmt.setTimestamp(3,ldFrdt);
......@@ -1109,17 +1303,9 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
if(count > 0)
{
count = 0;
sql = "update employee_mthad set "
+ "type = 'F' , "
+ "amount = amount + ? , "
+ "ref_type = 'C' , "
+ "ref_no = ?, "
+ "prop_yn = 'N' "
+ "where emp_code = ? "
+ "and ad_code = ? "
+ "and eff_date = ? "
+ "and exp_date = ?";
pstmt = conn.prepareStatement(sql);
////SQL5
pstmt = conn.prepareStatement(sql5);
pstmt.setDouble(1,lcTotClaimAmt);
pstmt.setString(2,tranIdGenerate);
pstmt.setString(3,lsPrevEmp);
......@@ -1134,23 +1320,27 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claime
errString = itmDBAccessEJB.getErrorString("","DS000",lsEmpCode,"",conn);//Claimed amount should be same as balance amount in case of full claime
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
//hrLogWriter.gbfErrWrite("", "", "", "DS000", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
// return errString;//Commented by Sana S on 09/12/19
}
}
else
{
count = 0;
sql = "insert into employee_mthad (emp_code, month_code, ad_code, eff_date, exp_date, type, amount,"
+ "chg_date, chg_user, chg_term, ref_type, ref_no, prop_yn) "
+ "Values(?,?,?,?,?,'F',?,?,?,?,'C',?,'N')";
pstmt = conn.prepareStatement(sql);
////SQL6
pstmt = conn.prepareStatement(sql6);
pstmt.setString(1,lsPrevEmp);
pstmt.setString(2,lsMonth);
pstmt.setString(3,lsPyrlAdclaim);
......@@ -1170,14 +1360,21 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claime
errString = itmDBAccessEJB.getErrorString("","DS000",lsEmpCode,"",conn);//Claimed amount should be same as balance amount in case of full claime
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
// hrLogWriter.gbfErrWrite("", "", "", "DS000", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
}
}//END ----if(lcTotClaimAmt != 0)
......@@ -1201,8 +1398,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
liClaimDet = 0;*/
//Added by sarita on 19MARCH2019 [START]
count = 0;
sql = "select count(*) as count from emp_adclaimhdr where tran_id = ?";
pstmt = conn.prepareStatement(sql);
////SQL7
pstmt = conn.prepareStatement(sql7);
pstmt.setString(1, tranIdGenerate);
rs = pstmt.executeQuery();
if(rs.next())
......@@ -1222,12 +1421,11 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
if(countempHdr == 0)
{
countempHdr = 0;
//Added by sarita on 19MARCH2019 [END]
sql = " insert into emp_adclaimhdr (tran_id, tran_date, emp_code, claim_amt, loan_adjamt,"
+ " payroll_voucher, prd_code__payroll, chg_date, chg_user, chg_term, ad_code,confirmed) "
+ " values (?, ?,?,0,0,?,?,?,?,?,?,'Y')";
pstmt = conn.prepareStatement(sql);
////SQL8
pstmt = conn.prepareStatement(sql8);
pstmt.setString(1, tranIdGenerate);
pstmt.setDate(2,claimDate ==null?null:new java.sql.Date(claimDate.getTime()));
pstmt.setString(3, lsEmpCode);
......@@ -1253,7 +1451,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
}
//}//END ----(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))
......@@ -1263,8 +1468,121 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
lcVouchHdrAmt = lcVouchHdrAmt + lcClaimAmt1;
System.out.println("liClaimDet ["+liClaimDet+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"] \t lcVouchHdrAmt["+lcVouchHdrAmt+"]");*/
//Commented by sarita on 18 FEBRUARY 2019 as claimDET and totClaimAmt was setting zero[END]
HashMap dwPayrvHdr = new HashMap();//Added by sarita on 26APR2019
HashMap payDetData = new HashMap();//Added by sarita on 26APR2019
//Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr]
if(countempHdr > 0)
{
count = 0;
////SQL9
pstmt = conn.prepareStatement(sql9);
pstmt.setDouble(1,lcTotClaimAmt);
pstmt.setString(2,tranIdGenerate);
count = pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
System.out.println("Updated ["+count+"] rows for emp_adclaimhdr table");
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claim
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
//hrLogWriter.gbfErrWrite("", "", "", "DS000", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
}
//Added by sarita on 18 FEBRUARY 2019 [END] -- [emp_adclaimhdr]
System.out.println("lcAdCode["+lcAdCode+"] \n lsEmpCode["+lsEmpCode+"] \n startDate["+startDate+"]\n endDate["+endDate+"]\n lcClaimAmt1["+lcClaimAmt1+"]\n ");
//Modified by Rohini T on 29/08/19[Start]
// erroCode = gbfClaimProc(lcAdCode, lsEmpCode, startDate, endDate, lcClaimAmt1, conn);//need to check
erroCode = gbfClaimProc(lcAdCode, lsEmpCode, startDate, endDate, lcClaimAmt1, conn);//need to check
//Modified by Rohini T on 29/08/19[End]
if((erroCode != null && erroCode.trim().length() > 0) && (erroCode.indexOf("Error") != -1))
{
//Modified by Rohini T on 29/08/19[Start]
headerDom = genericUtility.parseString(erroCode);
detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Sana S on 13/11/19 [start]
// hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", currErrorId, "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);
//Modified by Rohini T on 29/08/19[End]
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
//return errString;//Commented by Sana S on 09/12/19
}
count = 0;
System.out.println("EMP_ADCLAIM ::: "+sql10);
pstmt = conn.prepareStatement(sql10);
pstmt.setString(1,tranIdGenerate);
pstmt.setString(2,lsEmpCode);
pstmt.setString(3,lsAd);
pstmt.setTimestamp(4,startDate);
pstmt.setDouble(5,lcBalAmt1);
pstmt.setDouble(6,lcClaimAmt1);
count = pstmt.executeUpdate();
System.out.println("NO Of Record Insert the EMP_ADCLAIM is ["+count+"]");
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claime
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
//hrLogWriter.gbfErrWrite("", "", "", "DS000", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
//added by Sana S to continue for next process if current process has error[start] on 09/12/19
errorEmpCode=lsEmpCode;
conn.rollback();
continue;
// Added by Sana S on 09/12/19[end]
// return errString;//Commented by Sana S on 09/12/19
}
/*else
{
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "Process Complete", "I", 1, logConn);
}*/
//Modified by Rohini T on 29/08/19[End]
//Modified by Sana S on 10/12/19 [start]
/*dwPayrvHdr = new HashMap();//Added by sarita on 26APR2019
payDetData = new HashMap();//Added by sarita on 26APR2019
payDetList=new ArrayList();//Added By Sana S on 13/12/19
*/
if("V".equalsIgnoreCase(lsPayrollVouch))
{
String remarks = checkNullAndTrim(lsAdShdescr) + " Claim("+checkNullAndTrim(lsAdCode)+") on" + "("+utilMethod.day(claimDate)+")" ;
......@@ -1379,18 +1697,33 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{
payDetData = detailHashMap.get(lsEmpCode);
Double amt = ((Double)payDetData.get("amount") + lcVouchHdrAmt);
System.out.println("ammount::"+amt);
System.out.println("lcVouchHdrAmt::"+lcVouchHdrAmt);
payDetData.put("ad_code", lsAdCode);
payDetData.put("amount", amt);
//added by Sana S on 13/12/19[start]
payDetList.add(payDetData);
//added by Sana S on 13/12/19[end]
detailHashMap.put(lsEmpCode, payDetData);
dwPayrvHdr = headerHashMap.get(lsEmpCode);
headerHashMap.put(lsEmpCode,dwPayrvHdr);
System.out.println("**1**" + headerHashMap);
System.out.println("payDetList" + payDetList);
}
else
{
payDetData.put("ad_code", lsAdCode);
payDetData.put("amount", lcClaimAmt1);
//added by Sana S on 13/12/19[start]
payDetList.add(payDetData);
//added by Sana S on 13/12/19[end]
System.out.println("payDetList" + payDetList);
detailHashMap.put(lsEmpCode, payDetData);
HashMap dwPayrvHdr1 = new HashMap();
......@@ -1399,6 +1732,22 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
System.out.println("**2**" + headerHashMap);
}
System.out.println("payDetData for voucher" + payDetData);
System.out.println("dwPayrvHdr for voucher" + dwPayrvHdr);
}
lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019
lcTotClaimAmt = 0.0;
liClaimDet = 0;
System.out.println("final headerHashMap" + headerHashMap);
System.out.println("final detailHashMap" + detailHashMap);
//Modified by Sana S on 10/12/19 [end]
/*PerkClaimProcessComm pclaim = new PerkClaimProcessComm();
errString = pclaim.payrollVoucher(dwPayrvHdr,payDetList, "dw_claim",xtraParams,conn);
System.out.println("errString 625=="+errString);
......@@ -1408,123 +1757,55 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
return errString;
}*/
//Commented And Added by sarita on 26 APR 2019 [END]
}
//Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr]
if(countempHdr > 0)
{
count = 0;
sql = "update emp_adclaimhdr set claim_amt = claim_amt + ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,lcTotClaimAmt);
pstmt.setString(2,tranIdGenerate);
count = pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
System.out.println("Updated ["+count+"] rows for emp_adclaimhdr table");
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claim
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
//hrLogWriter.gbfErrWrite("", "", "", "DS000", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
}
}
lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019
lcTotClaimAmt = 0.0;
liClaimDet = 0;
//Added by sarita on 18 FEBRUARY 2019 [END] -- [emp_adclaimhdr]
System.out.println("lcAdCode["+lcAdCode+"] \n lsEmpCode["+lsEmpCode+"] \n startDate["+startDate+"]\n endDate["+endDate+"]\n lcClaimAmt1["+lcClaimAmt1+"]\n ");
//Modified by Rohini T on 29/08/19[Start]
// erroCode = gbfClaimProc(lcAdCode, lsEmpCode, startDate, endDate, lcClaimAmt1, conn);//need to check
erroCode = gbfClaimProc(lcAdCode, lsEmpCode, startDate, endDate, lcClaimAmt1, conn);//need to check
//Modified by Rohini T on 29/08/19[End]
if((erroCode != null && erroCode.trim().length() > 0) && (erroCode.indexOf("Error") != -1))
{
}//For Loop to get Selected Details Data Values [end]
//Modified by Rohini T on 29/08/19[Start]
headerDom = genericUtility.parseString(erroCode);
detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Sana S on 13/11/19 [start]
// hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", currErrorId, "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);
//Modified by Rohini T on 29/08/19[End]
return errString;
}
//Added by sarita on 26 APRIL 2019 [START]
System.out.println("errString ["+errString+"] \t headerHashMap ["+headerHashMap+"] \t voucherDetdata ["+detailHashMap+"]");
//commented by sana s on 11/12/19 [start]
/*if(errString == null || errString.trim().length() == 0)
{*/
//commented by sana s on 11/12/19[end]
//Modified by Sana S on 06/11/19 [start]
//errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,conn, logConn);
//errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,hrLogWriter,conn, logConn);//11/12/19
count = 0;
sql = " INSERT INTO EMP_ADCLAIM"
+ " (TRAN_ID, EMP_CODE, AD_CODE,"
+ " EFF_DATE, BAL_AMT, CLAIM_AMT)"
+ " VALUES(?,?,?,?,?,?)";
System.out.println("EMP_ADCLAIM ::: "+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdGenerate);
pstmt.setString(2,lsEmpCode);
pstmt.setString(3,lsAd);
pstmt.setTimestamp(4,startDate);
pstmt.setDouble(5,lcBalAmt1);
pstmt.setDouble(6,lcClaimAmt1);
count = pstmt.executeUpdate();
System.out.println("NO Of Record Insert the EMP_ADCLAIM is ["+count+"]");
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claime
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 13/11/19 [start]
//hrLogWriter.gbfErrWrite("", "", "", "DS000", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "DS000", "E", 2, logConn);
//Modified by Sana S on 13/11/19 [end]
//Modified by Rohini T on 29/08/19[End]
return errString;
}
//added by Sana S on 13/12/19[start]
//errorCode = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,hrLogWriter,conn, logConn);
//added by Sana S on 13/12/19[end]
//added By Sana S On 11/12/19 [start] to generate errString if there is no error in any process.
/*else
{
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "Process Complete", "I", 1, logConn);
String begPart = errString.substring(0,errString.indexOf("</description>"));
String endDesc = errString.substring(errString.indexOf("</description>"),errString.length());
errString="";
System.out.println("begPart ["+begPart+"] \t endDesc ["+endDesc+"] end of Desc");
errString = checkNullAndTrim(begPart) + "\r\n" + errorCode + checkNullAndTrim(endDesc);
System.out.print("errString after voucher generation>>"+errString);
}*/
//Modified by Rohini T on 29/08/19[End]
}//For Loop to get Selected Details Data Values [START]
//Added by sarita on 26 APRIL 2019 [START]
System.out.println("errString ["+errString+"] \t headerHashMap ["+headerHashMap+"] \t voucherDetdata ["+detailHashMap+"]");
if(errString == null || errString.trim().length() == 0)
{ //Modified by Sana S on 06/11/19 [start]
//errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,conn, logConn);
errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,hrLogWriter,conn, logConn);
//added By Sana S On 11/12/19 [end] to generate errString if there is no error in any process.
//Modified by Sana S on 06/11/19 [end]
//Modified by Rohini T on 29/08/19[Start]
//Modified by Sana S on 06/11/19 [start]
//if(errString != null && errString.trim().length() > 0 )
if((errString != null && errString.trim().length() > 0 ) && (!(errString.contains("VPSUCC1"))))
//if((errString != null && errString.trim().length() > 0 ) && (!(errString.contains("VPSUCC1"))))
//added by Sana S on 13/12/19[start]
/*if((errString != null && errString.trim().length() > 0 ) && (!(errorCode.contains("VPSUCC1"))))
//Modified By sana s on 06/11/19 [end]
{
System.out.print("error in voucher");
//Commented by Sana S on 05/11/19 [start]
/*headerDom = genericUtility.parseString(errString);
headerDom = genericUtility.parseString(errString);
detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn);
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);*/
errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);
//Commented by Sana S on 05/11/19 [end]
//Added by Sana S on 04/11/19 [start]
totRejRec = totRejRec + 1;
......@@ -1542,24 +1823,30 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Added by Sana S on 04/11/19
else
{
System.out.print("no error voucher");
totConfRec = totConfRec + 1;
System.out.print("totConfRec>>>>>"+totConfRec);
//Added by Sana S for rollback connection if error is occur on 09/12/19[start]
conn.commit();
//Added by Sana S for rollback connection if error is occur on 09/12/19[end]
isError = false;
}
}*/
//added by Sana S on 13/12/19[end]
//end
//Modified by Rohini T on 29/08/19[End]
//Added by Sana S on 04/11/19 [start]
/*//Added by Sana S on 04/11/19 [start]
setNodeValue(headerDom, "noof_confirmed", String.valueOf(totConfRec));
setNodeValue(headerDom, "noof_rejected", String.valueOf(totRejRec));
//Added by Sana S on 04/11/19 [end]
*/
//Modified by Rohini T on 29/08/19[End]
}
//Added by Sana S on 06/11/19 [start]
totFinRec = totConfRec + totRejRec;
//Added by Sana S on 06/11/19 [end]
//}commented by sana s on 11/12/19
//Added by sarita on 26 APRIL 2019 [END]
}
catch(Exception e)
{
......@@ -1583,6 +1870,50 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
finally
{
if (dwPayrvHdr.isEmpty() == false && payDetList.isEmpty() == false) {
//added by Sana S on 13/12/19[start]
errorCode = generateVoucher(dwPayrvHdr, payDetList, lsEmpCode, hrLogWriter, xtraParams, conn, logConn);
if ((errorCode != null && errorCode.trim().length() > 0) && (!(errorCode.contains("VPSUCC1"))))
//Modified By sana s on 06/11/19 [end]
{
System.out.print("error in voucher");
errString = itmDBAccessEJB.getErrorString("",errorCode,"","",conn);
totRejRec = totRejRec + 1;
System.out.print("totRejRec>>>>>" + totRejRec);
errorEmpCode=lsEmpCode;
//Added by Sana S for rollback connection if error is occur on 13/11/19[start]
conn.rollback();
//Added by Sana S for rollback connection if error is occur on 13/11/19[end]
} else {
//errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
System.out.print("no error voucher");
totConfRec = totConfRec + 1;
System.out.print("totConfRec>>>>>" + totConfRec);
//Added by Sana S for rollback connection if error is occur on 09/12/19[start]
conn.commit();
//Added by Sana S for rollback connection if error is occur on 09/12/19[end]
}
//added by Sana S on 13/12/19[end]
}
if(errorEmpCode ==null || errorEmpCode.trim().length() == 0 || errorEmpCode == "")
{
errorCode="VPSUCC1";
errString = itmDBAccessEJB.getErrorString("",errorCode,"","",conn);
}
//Added by Sana S on 09/12/19 [start]
setNodeValue(headerDom, "noof_confirmed", String.valueOf(totConfRec));
setNodeValue(headerDom, "noof_rejected", String.valueOf(totRejRec));
gbfDestructProcess(headerDom,hrLogWriter, logConn);
//added By Sana S on 09/12/19 [end]
try
{
......@@ -1700,19 +2031,25 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
///Added by Sana S on 06/11/19 [start]
private String getError(String errMsg, String Code, Connection conn) throws ITMException, Exception
//private String getError(String errMsg, String Code, Connection conn) throws ITMException, Exception
private String getError(String errMsg, String errString, Connection conn) throws ITMException, Exception
{
String mainStr ="";
try
{
String errString = "";
errString = new ITMDBAccessEJB().getErrorString("",Code,"","",conn);
System.out.println("Origional ErrorString is =====> <"+errString+">");
//String errString = "";
//errString = new ITMDBAccessEJB().getErrorString("",Code,"","",conn);
//System.out.println("Origional ErrorString is =====> <"+errString+"> end of Origional ErrorString");
/*String begPart = errString.substring(0,errString.indexOf("</description>"));
String endDesc = errString.substring(errString.indexOf("</description>"),errString.length());*/
String begPart = errString.substring(0,errString.indexOf("</description>"));
String endDesc = errString.substring(errString.indexOf("</description>"),errString.length());
System.out.println("begPart ["+begPart+"] \t endDesc ["+endDesc+"]");
mainStr = checkNullAndTrim(begPart) + errMsg + checkNullAndTrim(endDesc);
System.out.println("mainStr:::::::::::::::::: "+mainStr);
System.out.println("begPart ["+begPart+"] \t endDesc ["+endDesc+"] end of Desc");
mainStr = checkNullAndTrim(begPart) + "\r\n" + errMsg + checkNullAndTrim(endDesc);
System.out.println("mainStr:::::::::::::::::: "+mainStr+"END of mainStr");
//begPart = null;
//mainStr = errString;
}
......@@ -2837,9 +3174,6 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
private String gbfClaimProc (String lsAd, String lsEmp, Timestamp ldStartDt, Timestamp ldEndDt, double lcClaimAmt , Connection conn) throws ITMException, RemoteException
//Modified by Rohini T on 29/08/19[End]
{
Connection logConn=null;// added by Sana S on 06/12/19
logConn=getConnection();
String errorString = "";
PreparedStatement pstmt = null;
String sql = "";
......@@ -3235,9 +3569,15 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
if(key.equalsIgnoreCase(map1.getKey()))
{
detlData = map1.getValue();
hashList.add(detlData);
System.out.println("detlData for voucher:::"+detlData);
}
}
System.out.println("hedrData for voucher:::"+hedrData);
System.out.println("hashList for voucher:::"+hashList);
PerkClaimProcessComm pclaim = new PerkClaimProcessComm();
errString = pclaim.payrollVoucher(hedrData,hashList, "dw_claim",xtraParams,conn);
System.out.println("errString 625=="+errString);
......@@ -3256,7 +3596,9 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Modified by Sana S for passing emp code in error log writter on 13/11/19 [end]
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
//Commented by Sana S on 05/11/19 [start]
errString=currErrorId;
//errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);
//return currErrorId;
//Commented by Sana S on 05/11/19 [end]
......@@ -3311,6 +3653,58 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
return objName;
}
private String generateVoucher(HashMap dwPayrvHdr,ArrayList payDetList,String lsEmpCode,HRLogWriter hrLogWriter,String xtraParams, Connection conn,Connection logConn) throws ITMException
{
String errString="",currErrorId="";
NodeList detailList = null;
Node currDetail = null;
Document headerDom = null;
try {
PerkClaimProcessComm pclaim = new PerkClaimProcessComm();
errString = pclaim.payrollVoucher(dwPayrvHdr,payDetList, "dw_claim",xtraParams,conn);
System.out.println("errString 625=="+errString);
if(errString != null && errString.trim().length() > 0)
{
//errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
//Added by Varsha V on 01/11/19 [start]
headerDom = genericUtility.parseString(errString);
detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Sana S for passing emp code in error log writter on 13/11/19 [start]
// hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn);
hrLogWriter.gbfErrWrite("", lsEmpCode, "", currErrorId, "E", 2, logConn);
//Modified by Sana S for passing emp code in error log writter on 13/11/19 [end]
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
//Commented by Sana S on 05/11/19 [start]
errString=currErrorId;
conn.rollback();
//errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);
//return currErrorId;
//Commented by Sana S on 05/11/19 [end]
}
else
{
errString = "VPSUCC1";//added by Sana S on 06/11/19
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "Process Complete", "I", 1, logConn);
//Added by Varsha V on 01/11/19 [end]
conn.commit();
}
} catch (Exception e) {
e.printStackTrace();
throw new ITMException(e);
}
return errString;
}
public void gbfDestructProcess(Document dom,HRLogWriter hrLogWriter, Connection logConn) throws ITMException
{
//added by sana s on 18/10/19 [start]
......
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