Skip to content

B
business-java
Commit 1ebb8f76 authored by ssalve's avatar ssalve
Browse files
Options

Sarita : Done changes to set long name on 12 MARCH 2019 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198365 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 12485400
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 67 deletions
webitm-adm/ibase/webitm/ejb/adm/PerkClaimWOLoanAdjPrc.java
View file @ 1ebb8f76
...@@ -151,9 +151,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -151,9 +151,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
sql = "SELECT allowdedn_bal.emp_code, " sql = "SELECT allowdedn_bal.emp_code, "
+ "employee.emp_fname, " //Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [START]
+ "employee.emp_mname, " //+ "employee.emp_fname, "
+ "employee.emp_lname, " //+ "employee.emp_mname, "
//+ "employee.emp_lname, "
+ "employee.emp_fname_long, "
+ "employee.emp_mname_long, "
+ "employee.emp_lname_long, "
//Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [END]
+ "allowdedn_bal.ad_code, " + "allowdedn_bal.ad_code, "
+ "allowdedn_bal.start_date, " + "allowdedn_bal.start_date, "
+ "allowdedn_bal.end_date, " + "allowdedn_bal.end_date, "
...@@ -191,9 +196,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -191,9 +196,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
while(rs.next()) while(rs.next())
{ {
empCode = checkNullAndTrim(rs.getString("emp_code")); empCode = checkNullAndTrim(rs.getString("emp_code"));
empFname = checkNullAndTrim(rs.getString("emp_fname")); //Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [START]
empMname = checkNullAndTrim(rs.getString("emp_mname")); //empFname = checkNullAndTrim(rs.getString("emp_fname"));
empLname = checkNullAndTrim(rs.getString("emp_lname")); //empMname = checkNullAndTrim(rs.getString("emp_mname"));
//empLname = checkNullAndTrim(rs.getString("emp_lname"));
empFname = checkNullAndTrim(rs.getString("emp_fname_long"));
empMname = checkNullAndTrim(rs.getString("emp_mname_long"));
empLname = checkNullAndTrim(rs.getString("emp_lname_long"));
//Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [END]
adCode = checkNullAndTrim(rs.getString("ad_code")); adCode = checkNullAndTrim(rs.getString("ad_code"));
startDate=rs.getTimestamp("start_date"); startDate=rs.getTimestamp("start_date");
endDate = rs.getTimestamp("end_date"); endDate = rs.getTimestamp("end_date");
...@@ -270,9 +280,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -270,9 +280,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
retTabSepStrBuff.append("<emp_lname>").append("<![CDATA[" + empLname + "]]>").append("</emp_lname>\r\n"); retTabSepStrBuff.append("<emp_lname>").append("<![CDATA[" + empLname + "]]>").append("</emp_lname>\r\n");
//retTabSepStrBuff.append("<claim_amt>").append("<![CDATA[" + amtBal + "]]>").append("</claim_amt>\r\n");*/ //retTabSepStrBuff.append("<claim_amt>").append("<![CDATA[" + amtBal + "]]>").append("</claim_amt>\r\n");*/
retTabSepStrBuff.append("<emp_code>").append("<![CDATA[" + empCode + "]]>").append("</emp_code>\r\n"); retTabSepStrBuff.append("<emp_code>").append("<![CDATA[" + empCode + "]]>").append("</emp_code>\r\n");
retTabSepStrBuff.append("<emp_fname>").append("<![CDATA[" + empFname + "]]>").append("</emp_fname>\r\n"); //Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [START]
retTabSepStrBuff.append("<emp_mname>").append("<![CDATA[" + empMname + "]]>").append("</emp_mname>\r\n"); //retTabSepStrBuff.append("<emp_fname>").append("<![CDATA[" + empFname + "]]>").append("</emp_fname>\r\n");
retTabSepStrBuff.append("<emp_lname>").append("<![CDATA[" + empLname + "]]>").append("</emp_lname>\r\n"); //retTabSepStrBuff.append("<emp_mname>").append("<![CDATA[" + empMname + "]]>").append("</emp_mname>\r\n");
//retTabSepStrBuff.append("<emp_lname>").append("<![CDATA[" + empLname + "]]>").append("</emp_lname>\r\n");
retTabSepStrBuff.append("<emp_fname_long>").append("<![CDATA[" + empFname + "]]>").append("</emp_fname_long>\r\n");
retTabSepStrBuff.append("<emp_mname_long>").append("<![CDATA[" + empMname + "]]>").append("</emp_mname_long>\r\n");
retTabSepStrBuff.append("<emp_lname_long>").append("<![CDATA[" + empLname + "]]>").append("</emp_lname_long>\r\n");
//Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [END]
retTabSepStrBuff.append("<ad_code>").append("<![CDATA[" + adCode + "]]>").append("</ad_code>\r\n"); retTabSepStrBuff.append("<ad_code>").append("<![CDATA[" + adCode + "]]>").append("</ad_code>\r\n");
retTabSepStrBuff.append("<start_date>").append("<![CDATA[" + startDateStr + "]]>").append("</start_date>\r\n"); retTabSepStrBuff.append("<start_date>").append("<![CDATA[" + startDateStr + "]]>").append("</start_date>\r\n");
retTabSepStrBuff.append("<end_date>").append("<![CDATA[" + endDateStr + "]]>").append("</end_date>\r\n"); retTabSepStrBuff.append("<end_date>").append("<![CDATA[" + endDateStr + "]]>").append("</end_date>\r\n");
...@@ -782,8 +797,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -782,8 +797,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
acctCode = checkNullAndTrim(rs.getString("acct_code")); //Added and Commented by sarita on 15 FEB 18 [START]
cctrCode = checkNullAndTrim(rs.getString("cctr_code")); //acctCode = checkNullAndTrim(rs.getString("acct_code"));
//cctrCode = checkNullAndTrim(rs.getString("cctr_code"));
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
//Added and Commented by sarita on 15 FEB 18 [END]
} }
System.out.println("acctCode is ["+acctCode+"] \t cctrCode is ["+cctrCode+"]"); System.out.println("acctCode is ["+acctCode+"] \t cctrCode is ["+cctrCode+"]");
if(rs != null) if(rs != null)
...@@ -863,9 +882,16 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -863,9 +882,16 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
// Modified by Piyush on 13/02/2015 [To check the claim amount in case of full_claim = "Y"].End // Modified by Piyush on 13/02/2015 [To check the claim amount in case of full_claim = "Y"].End
//If block for checking employee code with previous employee [START] //If block for checking employee code with previous employee [START]
System.out.println("Employee ["+lsEmpCode+"] \t Previous Employee ["+lsPrevEmp+"] \t liClaimDet ["+liClaimDet+"] \t lsPayrollVouch ["+lsPayrollVouch+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"]"); System.out.println("Employee11 ["+lsEmpCode+"] \t Previous Employee ["+lsPrevEmp+"] \t liClaimDet ["+liClaimDet+"] \t lsPayrollVouch ["+lsPayrollVouch+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"]");
//Added by sarita on 18 FEBRUARY 2019 to set claimDet and totClaimAmt set into table [START]
liClaimDet ++;
lcTotClaimAmt = lcTotClaimAmt + lcClaimAmt1;
lcVouchHdrAmt = lcVouchHdrAmt + lcClaimAmt1;
System.out.println("liClaimDet ["+liClaimDet+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"] \t lcVouchHdrAmt["+lcVouchHdrAmt+"]");
//Added by sarita on 18 FEBRUARY 2019 to set claimDet and totClaimAmt set into table [END]
if(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp))) if(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))
{ {
lsPrevEmp = lsEmpCode;//Added by sarita on 18 FEBRUARY 2019 to set emp code as previous employee
if(liClaimDet > 0) if(liClaimDet > 0)
{ {
if("P".equalsIgnoreCase(lsPayrollVouch)) if("P".equalsIgnoreCase(lsPayrollVouch))
...@@ -965,7 +991,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -965,7 +991,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
}//END ----if(lcTotClaimAmt != 0) }//END ----if(lcTotClaimAmt != 0)
}//END IF----if("P".equalsIgnoreCase(lsPayrollVouch)) }//END IF----if("P".equalsIgnoreCase(lsPayrollVouch))
}//END ----(liClaimDet > 0) }//END ----(liClaimDet > 0)
lsPrevEmp = lsEmpCode; //lsPrevEmp = lsEmpCode; Commented by sarita on 18 FEBRUARY 2019
if(lsBankParm != null && lsBankParm.trim().length() > 0) if(lsBankParm != null && lsBankParm.trim().length() > 0)
{ {
bankCode = lsBankParm; bankCode = lsBankParm;
...@@ -978,9 +1004,9 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -978,9 +1004,9 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{ {
bankCode = lsBankEnv; bankCode = lsBankEnv;
} }
lcVouchHdrAmt = 0.0; /*lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019
lcTotClaimAmt = 0.0; lcTotClaimAmt = 0.0;
liClaimDet = 0; liClaimDet = 0;*/
count = 0; count = 0;
sql = " insert into emp_adclaimhdr (tran_id, tran_date, emp_code, claim_amt, loan_adjamt," sql = " insert into emp_adclaimhdr (tran_id, tran_date, emp_code, claim_amt, loan_adjamt,"
...@@ -1009,11 +1035,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1009,11 +1035,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
return errString; return errString;
} }
}//END ----(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp))) }//END ----(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))
liClaimDet ++; //Commented by sarita on 18 FEBRUARY 2019 as claimDET and totClaimAmt was setting zero[START]
/*liClaimDet ++;
lcTotClaimAmt = lcTotClaimAmt + lcClaimAmt1; lcTotClaimAmt = lcTotClaimAmt + lcClaimAmt1;
lcVouchHdrAmt = lcVouchHdrAmt + lcClaimAmt1; lcVouchHdrAmt = lcVouchHdrAmt + lcClaimAmt1;
System.out.println("liClaimDet ["+liClaimDet+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"] \t lcVouchHdrAmt["+lcVouchHdrAmt+"]"); 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]
if("V".equalsIgnoreCase(lsPayrollVouch)) if("V".equalsIgnoreCase(lsPayrollVouch))
{ {
String remarks = checkNullAndTrim(lsAdShdescr) + " Claim("+checkNullAndTrim(lsAdCode)+") on" + "("+utilMethod.day(claimDate)+")" ; String remarks = checkNullAndTrim(lsAdShdescr) + " Claim("+checkNullAndTrim(lsAdCode)+") on" + "("+utilMethod.day(claimDate)+")" ;
...@@ -1106,7 +1133,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1106,7 +1133,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
// Modified by Piyush on 20/05/2011 to support other deduction [AD1BSUlsfullClaimN002].End // Modified by Piyush on 20/05/2011 to support other deduction [AD1BSUlsfullClaimN002].End
*/ */
// --------------------- PB Code Not Migrated -------------------- [END] ---------------- // --------------------- PB Code Not Migrated -------------------- [END] ----------------
count = 0; /*count = 0;
sql = "update emp_adclaimhdr set claim_amt = ? where tran_id = ?"; sql = "update emp_adclaimhdr set claim_amt = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,lcTotClaimAmt); pstmt.setDouble(1,lcTotClaimAmt);
...@@ -1122,7 +1149,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1122,7 +1149,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{ {
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claim errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claim
return errString; return errString;
} }*/
PerkClaimProcessComm pclaim = new PerkClaimProcessComm(); PerkClaimProcessComm pclaim = new PerkClaimProcessComm();
errString = pclaim.payrollVoucher(dwPayrvHdr,payDetList, "dw_claim",xtraParams,conn); errString = pclaim.payrollVoucher(dwPayrvHdr,payDetList, "dw_claim",xtraParams,conn);
...@@ -1133,6 +1160,28 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1133,6 +1160,28 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
return errString; return errString;
} }
} }
//Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr]
count = 0;
sql = "update emp_adclaimhdr set 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
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 "); System.out.println("lcAdCode["+lcAdCode+"] \n lsEmpCode["+lsEmpCode+"] \n startDate["+startDate+"]\n endDate["+endDate+"]\n lcClaimAmt1["+lcClaimAmt1+"]\n ");
erroCode = gbfClaimProc(lcAdCode, lsEmpCode, startDate, endDate, lcClaimAmt1, conn);//need to check erroCode = gbfClaimProc(lcAdCode, lsEmpCode, startDate, endDate, lcClaimAmt1, conn);//need to check
if((erroCode != null && erroCode.trim().length() > 0) && (erroCode.indexOf("Error") != -1)) if((erroCode != null && erroCode.trim().length() > 0) && (erroCode.indexOf("Error") != -1))
...@@ -1432,7 +1481,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1432,7 +1481,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
isPerkElig = "N"; isPerkElig = "N";
sql = "select emp_fname, emp_lname, grade, " //Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [START]
//sql = "select emp_fname, emp_lname, grade, "
sql = "select emp_fname_long, emp_lname_long, grade, "
//Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [START]
+ "cadre, date_join, pay_site, dept_code, " + "cadre, date_join, pay_site, dept_code, "
+ "basic, stan_code__hq " + "basic, stan_code__hq "
+ "from employee " + "from employee "
...@@ -1442,8 +1494,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1442,8 +1494,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
lsEmpFname = rs.getString("emp_fname"); //Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [START]
lsEmpLname = rs.getString("emp_lname"); //lsEmpFname = rs.getString("emp_fname");
//lsEmpLname = rs.getString("emp_lname");
lsEmpFname = rs.getString("emp_fname_long");
lsEmpLname = rs.getString("emp_lname_long");
//Commented And Added by Sarita to get emp_fname_long , emp_mname_long , emp_lname_long instead[emp_fname,emp_mname,emp_lname] on 12MARCH2019 [END]
empGrade = rs.getString("grade"); empGrade = rs.getString("grade");
lsEmpCadre = rs.getString("cadre"); lsEmpCadre = rs.getString("cadre");
empJoinDate = rs.getTimestamp("date_join"); empJoinDate = rs.getTimestamp("date_join");
......
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