Commit 42d8e72e authored by ssalve's avatar ssalve

Sarita : Done changes to resolve Voucher Creation issue for same employees on 26 APRIL 2019

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200109 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0bf6cb0a
...@@ -11,6 +11,7 @@ import java.text.SimpleDateFormat; ...@@ -11,6 +11,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map.Entry;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.w3c.dom.CDATASection; import org.w3c.dom.CDATASection;
import org.w3c.dom.Document; import org.w3c.dom.Document;
...@@ -459,13 +460,17 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -459,13 +460,17 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
double lcBaseAmt = 0.0 , lcSlabAmt = 0.0, lcResultAmt = 0.0, lcCalcAmt = 0.0, lcAmt = 0.0, lcRndTo = 0.0; double lcBaseAmt = 0.0 , lcSlabAmt = 0.0, lcResultAmt = 0.0, lcCalcAmt = 0.0, lcAmt = 0.0, lcRndTo = 0.0;
int liClaimDet = 0,count = 0,liSeqNo = 0, liLineNo = 0,parentNodeListLength = 0 , childNodeListLength = 0,cnt1 = 0; int liClaimDet = 0,count = 0,liSeqNo = 0, liLineNo = 0,parentNodeListLength = 0 , childNodeListLength = 0,cnt1 = 0;
HashMap<String , String> headerDomValues = new HashMap<String , String>(); HashMap<String , String> headerDomValues = new HashMap<String , String>();
HashMap dwPayrvHdr = new HashMap(); //HashMap dwPayrvHdr = new HashMap(); Commented by sarita on 26APRIL2019
HashMap<String, String> dwPerkProcessDet = new HashMap<String, String>(); HashMap<String, String> dwPerkProcessDet = new HashMap<String, String>();
ArrayList payDetList = new ArrayList(); ArrayList payDetList = new ArrayList();
HashMap payDet = null; HashMap payDet = null;
String erroCode = "",lsAdname = "",lcBalAmtStr = "", lcClaimAmtStr = ""; String erroCode = "",lsAdname = "",lcBalAmtStr = "", lcClaimAmtStr = "";
int cntr = 0 , countempHdr = 0; int cntr = 0 , countempHdr = 0;
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
//Added by sarita on 26 APRIL 2019 [START]
HashMap<String,HashMap<String,Double>> detailHashMap = new HashMap<String, HashMap<String,Double>>();
HashMap<String,HashMap> headerHashMap = new HashMap<String,HashMap>();
//Added by sarita on 26 APRIL 2019 [END]
try try
{ {
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
...@@ -1068,6 +1073,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1068,6 +1073,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
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] //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
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)+")" ;
...@@ -1099,10 +1106,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1099,10 +1106,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
dwPayrvHdr.put("chg_user", userId); //24 dwPayrvHdr.put("chg_user", userId); //24
dwPayrvHdr.put("chg_term", chgTerm); dwPayrvHdr.put("chg_term", chgTerm);
payDet = new HashMap(); /*payDet = new HashMap(); Commented by sarita on 26 APRIL 2019
payDet.put("ad_code", lsAdCode); payDet.put("ad_code", lsAdCode);
payDet.put("amount", lcClaimAmt1); payDet.put("amount", lcClaimAmt1);
payDetList.add(payDet); payDetList.add(payDet);*/
System.out.println("HashMap [dwPayrvHdr] ::: ["+dwPayrvHdr+"] \n payDetList is ::: ["+payDetList+"]"); System.out.println("HashMap [dwPayrvHdr] ::: ["+dwPayrvHdr+"] \n payDetList is ::: ["+payDetList+"]");
...@@ -1177,15 +1184,40 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1177,15 +1184,40 @@ 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;
}*/ }*/
//Commented And Added by sarita on 26 APR 2019 [START]
if(headerHashMap != null && headerHashMap.containsKey(lsEmpCode))
{
payDetData = detailHashMap.get(lsEmpCode);
Double amt = ((Double)payDetData.get("amount") + lcVouchHdrAmt);
payDetData.put("ad_code", lsAdCode);
payDetData.put("amount", amt);
detailHashMap.put(lsEmpCode, payDetData);
dwPayrvHdr = headerHashMap.get(lsEmpCode);
headerHashMap.put(lsEmpCode,dwPayrvHdr);
System.out.println("**1**" + headerHashMap);
}
else
{
payDetData.put("ad_code", lsAdCode);
payDetData.put("amount", lcClaimAmt1);
detailHashMap.put(lsEmpCode, payDetData);
HashMap dwPayrvHdr1 = new HashMap();
dwPayrvHdr1 = dwPayrvHdr;
headerHashMap.put(lsEmpCode,dwPayrvHdr);
System.out.println("**2**" + headerHashMap);
}
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);
System.out.println("errString 625=="+errString); System.out.println("errString 625=="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
//errString = itmDBAccessEJB.getErrorString("","DS000","","",conn); //errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
return errString; return errString;
} }*/
//Commented And Added by sarita on 26 APR 2019 [END]
} }
//Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr] //Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr]
if(countempHdr > 0) if(countempHdr > 0)
...@@ -1246,6 +1278,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1246,6 +1278,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
return errString; return errString;
} }
}//For Loop to get Selected Details Data Values [START] }//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)
{
errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,conn);
}
//Added by sarita on 26 APRIL 2019 [END]
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -2850,5 +2890,52 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -2850,5 +2890,52 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{ {
return Math.round(round * Math.pow(10, scale)) / Math.pow(10, scale); return Math.round(round * Math.pow(10, scale)) / Math.pow(10, scale);
} }
//Added by sarita on 26 APRIL 2019 [START]
private String getHashMapValDiff(HashMap<String,HashMap> data1 , HashMap<String, HashMap<String, Double>> voucherDetdata,String xtraParams,Connection conn) throws ITMException
{
String errString = "";
HashMap hedrData = new HashMap();
HashMap detlData = new HashMap();
ArrayList hashList = new ArrayList();
try
{
System.out.println("******** Inside Method getHashMapValDiff *********** ");
System.out.println("data1 ["+data1+"] \t data2 ["+voucherDetdata+"]" );
for(String key : data1.keySet())
{
hedrData = data1.get(key);
System.out.println("Key is ["+key+"]"+"Total Value in HashMap 1 is ["+hedrData+"]");
for (Entry<String, HashMap<String, Double>> map1 : voucherDetdata.entrySet())
{
System.out.println(data1.containsKey(map1.getKey()));
//if(data1.containsKey(map1.getKey()))
if(key.equalsIgnoreCase(map1.getKey()))
{
detlData = map1.getValue();
hashList.add(detlData);
}
}
PerkClaimProcessComm pclaim = new PerkClaimProcessComm();
errString = pclaim.payrollVoucher(hedrData,hashList, "dw_claim",xtraParams,conn);
System.out.println("errString 625=="+errString);
if(errString != null && errString.trim().length() > 0)
{
//errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
return errString;
}
hashList.clear();
}
}
catch(Exception e)
{
System.out.println(e);
e.printStackTrace();
throw new ITMException(e);
}
return errString;
}
//Added by sarita on 26 APRIL 2019 [END]
} }
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