Skip to content

B
business-java
Commit 465dfdda authored by sanashaikh's avatar sanashaikh
Browse files
Options

Sana S:Modified on 06/12/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213224 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 942f62fb
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 84 deletions
webitm-adm/src/ibase/webitm/ejb/adm/PerkClaimWOLoanAdjPrc.java
View file @ 465dfdda
......@@ -421,11 +421,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]
//Modified By Yashwant S on 27/11/19 [START]
//gbfDestructProcess(headerDom,hrLogWriter, logConn);
//Modified By Yashwant S on 27/11/19 [End]
gbfDestructProcess(headerDom,hrLogWriter, logConn);
//Modified by Rohini T on 29/08/19[End]
/*if ((retStr != null && retStr.trim().length() > 0) && (retStr.indexOf("Errors") != -1)) //Error
{
......@@ -458,7 +454,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
finally
{
try
{
{
if(isError)
{
conn.rollback();
......@@ -601,10 +597,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{
errString = itmDBAccessEJB.getErrorString("","VTBLNKDTL",userId,"",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified By Yashwant S on 27/11/19 [START]
//hrLogWriter.gbfErrWrite("", "", "", "VTBLNKDTL", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", "", "", "VTBLNKDTL", "E", logConn);
//Modified By Yashwant S on 27/11/19 [END]
hrLogWriter.gbfErrWrite("", "", "", "VTBLNKDTL", "E", 2, logConn);
//Modified by Rohini T on 29/08/19[End]
return errString;
}
......@@ -634,10 +627,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{
errString = itmDBAccessEJB.getErrorString("","VSENVAR1","","",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified By Yashwant S on 27/11/19 [START]
//hrLogWriter.gbfErrWrite("", "", "", "VSENVAR1", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", "", "", "VSENVAR1", "E", logConn);
//Modified By Yashwant S on 27/11/19 [END]
hrLogWriter.gbfErrWrite("", "", "", "VSENVAR1", "E", 2, logConn);
//Modified by Rohini T on 29/08/19[End]
return errString;
}
......@@ -739,10 +729,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{
errString = itmDBAccessEJB.getErrorString("","VSENVAR1",userId,"",conn);
//Modified by Rohini T on 29/08/19[Start]
//Modified By Yashwant S on 27/11/19 [START]
//hrLogWriter.gbfErrWrite("", "", "", "VSENVAR1", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", "", "", "VSENVAR1", "", logConn);
//Modified By Yashwant S on 27/11/19 [End]
hrLogWriter.gbfErrWrite("", "", "", "VSENVAR1", "E", 2, logConn);
//Modified by Rohini T on 29/08/19[End]
return errString;
}
......@@ -761,10 +748,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{
errString = itmDBAccessEJB.getErrorString("","VTPED1","","",conn);//VTPED1 code not in database
//Modified by Rohini T on 29/08/19[Start]
//Modified By Yashwant S on 27/11/19 [START]
//hrLogWriter.gbfErrWrite("", "", "", "VTPED1", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", "", "", "VTPED1", "E", logConn);
//Modified By Yashwant S on 27/11/19 [End]
hrLogWriter.gbfErrWrite("", "", "", "VTPED1", "E", 2, logConn);
//Modified by Rohini T on 29/08/19[End]
return errString;
}
......@@ -794,10 +778,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{
errString = itmDBAccessEJB.getErrorString("","VTSEQ","","",conn);//VTPED1 code not in database
//Modified by Rohini T on 29/08/19[Start]
//Modified By Yashwant S on 27/11/19 [START]
//hrLogWriter.gbfErrWrite("", "", "", "VTSEQ", "E", 2, logConn);
hrLogWriter.gbfErrWrite("", "", "", "VTSEQ", "E", logConn);
//Modified By Yashwant S on 27/11/19 [END]
hrLogWriter.gbfErrWrite("", "", "", "VTSEQ", "E", 2, logConn);
//Modified by Rohini T on 29/08/19[End]
return errString;
}
......@@ -890,9 +871,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
else
{
......@@ -905,10 +884,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
}
}
......@@ -921,9 +897,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
else if(lcClaimAmt1 < 0)
{
......@@ -934,9 +908,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
//IF BLOCK for Claim Amount and Balance Amount CHECK [END]
......@@ -965,9 +937,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
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)
......@@ -1031,9 +1001,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
// [To locak allowdedn_bal table before processing as per multiple voucher case reported from Sun].Start
......@@ -1075,10 +1043,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
// [To locak allowdedn_bal table before processing as per multiple voucher case reported from Sun].End
......@@ -1092,9 +1057,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
// Modified by Piyush on 13/02/2015 [To check the claim amount in case of full_claim = "Y"].End
......@@ -1178,9 +1141,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
}
else
......@@ -1212,13 +1173,11 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
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("", "", "", "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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
}
}//END ----if(lcTotClaimAmt != 0)
......@@ -1290,13 +1249,11 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
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("", "", "", "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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
}
//}//END ----(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))
......@@ -1476,9 +1433,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
}
lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019
......@@ -1506,9 +1461,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
count = 0;
......@@ -1516,6 +1469,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
+ " (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);
......@@ -1540,9 +1494,7 @@ 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;
break; //Modified By Yashwant S on [27/11/19]
return errString;
}
/*else
{
......@@ -1590,7 +1542,6 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Added by Sana S on 04/11/19
else
{
conn.commit(); //Modified By Yashwant S on [27/11/19]
totConfRec = totConfRec + 1;
System.out.print("totConfRec>>>>>"+totConfRec);
isError = false;
......@@ -1605,13 +1556,6 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Modified by Rohini T on 29/08/19[End]
}
//Modified By Yashwant S on 27/11/19 [START]
else
{
conn.rollback();
return errString;
}
//Modified By Yashwant S on 27/11/19 [END]
//Added by Sana S on 06/11/19 [start]
totFinRec = totConfRec + totRejRec;
//Added by Sana S on 06/11/19 [end]
......@@ -1632,15 +1576,16 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}
errString = objAdmCommon.getErrorMessage(e, "");
System.out.println("errString ["+errString+"]");
System.out.println("getMessage() ["+e.getMessage()+"]");
//Added by Sana S on 06/12/19 [start] for writing exception in log writter.
hrLogWriter.gbfErrWrite("", lsEmpCode, "", errString, "E", 2, logConn);
//throw new ITMException(e);
}
finally
{
try
{
//Modified By Yashwant S on 27/11/19 [START]
gbfDestructProcess(headerDom,hrLogWriter, logConn);
//Modified By Yashwant S on 27/11/19 [End]
if(rs != null)
{
rs.close();
......@@ -2889,9 +2834,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Migration of Method function string gbf_claim_proc (string ls_ad, string ls_emp, datetime ld_start, datetime ld_end, decimal lc_claimamt) [START]
//Modified by Rohini T on 29/08/19[Start]
//private String gbfClaimProc (String lsAd, String lsEmp, Timestamp ldStartDt, Timestamp ldEndDt, double lcClaimAmt , Connection conn) throws ITMException
private String gbfClaimProc (String lsAd, String lsEmp, Timestamp ldStartDt, Timestamp ldEndDt, double lcClaimAmt , Connection conn) throws ITMException
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 = "";
......@@ -2924,6 +2872,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
if(count == 0)
{
errorString = itmDBAccessEJB.getErrorString("","DS000NR","","",conn);
return errorString;
}
}
......
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