Skip to content

B
business-java
Commit 5dd99897 authored by kmandhre's avatar kmandhre
Browse files
Options

bug fixing 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95629 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4cf5318a
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 54 deletions
webitm-adm/ibase/webitm/ejb/adm/PerkClaimIC.java
View file @ 5dd99897
......@@ -1116,10 +1116,10 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
double claimTotalAmt = 0.0;
int case1 = 0;
int case2 = 0;
System.out.println("DETAIL2 TEST LENGTH="+parentNodeListLength);
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
Element parentNode1 = (Element)parentNodeList.item(ctr);
//String selected = parentNode1.getAttribute("selected");//change by Kunal on 31/08/12
......@@ -1205,20 +1205,10 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
valueXmlString.append( "<Detail3 domID='"+domID+"' selected=\"Y\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<ad_code><![CDATA[" ).append( loanAdCode).append( "]]></ad_code>\r\n" );
valueXmlString.append( "<bal_amt><![CDATA[" ).append( loanBalAmt).append( "]]></bal_amt>\r\n" );
valueXmlString.append( "<ref_no><![CDATA[" ).append( loanRefNo).append( "]]></ref_no>\r\n" );
valueXmlString.append( "<ref_type><![CDATA[" ).append( "L").append( "]]></ref_type>\r\n" );
valueXmlString.append( "<scheme_no><![CDATA[" ).append( schemeNo).append( "]]></scheme_no>\r\n" );
valueXmlString.append( "<ad_code><![CDATA[" ).append( loanAdCode).append( "]]></ad_code>\r\n" );
valueXmlString.append( "<eff_date><![CDATA[" ).append( sdf.format(startDate)).append( "]]></eff_date>\r\n" );
valueXmlString.append( "<start_date><![CDATA[" ).append( sdf.format(startDate)).append( "]]></start_date>\r\n" );
valueXmlString.append( "<end_date><![CDATA[" ).append( sdf.format(endDate)).append( "]]></end_date>\r\n" );
valueXmlString.append( "<loan_amt><![CDATA[" ).append( loanAmt).append( "]]></loan_amt>\r\n" );
valueXmlString.append( "<adj_perc><![CDATA[" ).append( loanAdjPerc).append( "]]></adj_perc>\r\n" );
valueXmlString.append( "<mon_inst><![CDATA[" ).append( loanMonInst).append( "]]></mon_inst>\r\n" );
valueXmlString.append( "<interest><![CDATA[" ).append( loanInterest).append( "]]></interest>\r\n" );
valueXmlString.append( "<bal_amt><![CDATA[" ).append( loanBalAmt).append( "]]></bal_amt>\r\n" );
double temp;
if(balanceAmt > 0)
{
......@@ -1242,6 +1232,20 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
valueXmlString.append( "<adj_amt><![CDATA[0]]></adj_amt>\r\n" );
//adjAmtTemp = 0;
}
valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<ref_type><![CDATA[" ).append( "L").append( "]]></ref_type>\r\n" );
valueXmlString.append( "<scheme_no><![CDATA[" ).append( schemeNo).append( "]]></scheme_no>\r\n" );
valueXmlString.append( "<start_date><![CDATA[" ).append( sdf.format(startDate)).append( "]]></start_date>\r\n" );
valueXmlString.append( "<end_date><![CDATA[" ).append( sdf.format(endDate)).append( "]]></end_date>\r\n" );
valueXmlString.append( "<loan_amt><![CDATA[" ).append( loanAmt).append( "]]></loan_amt>\r\n" );
valueXmlString.append( "<adj_perc><![CDATA[" ).append( loanAdjPerc).append( "]]></adj_perc>\r\n" );
valueXmlString.append( "<mon_inst><![CDATA[" ).append( loanMonInst).append( "]]></mon_inst>\r\n" );
valueXmlString.append( "<interest><![CDATA[" ).append( loanInterest).append( "]]></interest>\r\n" );
// adjAmt = adjAmt + adjAmtTemp;
// lc_adj = lc_adj + dw_1.getitemdecimal(ll_row,"adj_amt")
valueXmlString.append("</Detail3>\r\n");
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimPos.java
View file @ 5dd99897
......@@ -113,7 +113,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
//System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr);
//String selected = parentNode1.getAttribute("selected");//change by Kunal on 31/08/12
......@@ -179,11 +179,12 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
*/
parentNodeList = dom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength();
double claimTotalAmt = 0.0;
double claimTotalAmt = 0.0;
System.out.println("TEST LENGTH 2="+parentNodeListLength);
// get the total claim amt
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
//parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr);
//claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2"));
......@@ -195,11 +196,12 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
parentNodeList = dom.getElementsByTagName("Detail3");
parentNodeListLength = parentNodeList.getLength();
System.out.println("TEST LENGTH 3="+parentNodeListLength);
double totalAdjAmt = 0.0;
// get the total loan adjusted amount
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr);
adjAmt = Double.parseDouble(genericUtility.getColumnValue("adj_amt", dom, "2")== null?"0":genericUtility.getColumnValue("adj_amt", dom, "2"));
......@@ -494,40 +496,52 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
}//parse Detail2 end
parentNodeList = dom.getElementsByTagName("Detail3");
parentNodeListLength = parentNodeList.getLength();
NodeList detail3List = dom.getElementsByTagName("Detail3");
parentNodeListLength = detail3List.getLength();
System.out.println("TEST LENGTH LOAN=="+parentNodeListLength);
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
//parse Detail3 start
System.out.println("TEST LENGTH LOAN=="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
refNo = genericUtility.getColumnValue("ref_no", dom, "3");
loanAdCode = genericUtility.getColumnValue("ad_code", dom, "3");
loanAmt = Double.parseDouble(genericUtility.getColumnValue("loan_amt", dom, "3")== null?"0":genericUtility.getColumnValue("loan_amt", dom, "3"));
adjAmt = Double.parseDouble(genericUtility.getColumnValue("adj_amt", dom, "3")== null?"0":genericUtility.getColumnValue("adj_amt", dom, "3"));
monInst = Double.parseDouble(genericUtility.getColumnValue("mon_inst", dom, "3")== null?"0":genericUtility.getColumnValue("mon_inst", dom, "3"));
interest = Double.parseDouble(genericUtility.getColumnValue("interest", dom, "3")== null?"0":genericUtility.getColumnValue("interest", dom, "3"));
schemeNo = genericUtility.getColumnValue("scheme_no", dom, "3");
lineNo = genericUtility.getColumnValue("line_no", dom, "3");
if(genericUtility.getColumnValue("start_date", dom, "3") == null)
//parentNode = parentNodeList.item(ctr);
//tranId = genericUtility.getColumnValueFromNode( "tran_id", parentNodeList.item(ctr) );
//refNo = genericUtility.getColumnValue("ref_no", dom, "3");
refNo = genericUtility.getColumnValueFromNode( "ref_no", detail3List.item(ctr) );
loanAdCode = genericUtility.getColumnValueFromNode( "ad_code", detail3List.item(ctr) ) ;
//loanAmt = Double.parseDouble(genericUtility.getColumnValue("loan_amt", dom, "3")== null?"0":genericUtility.getColumnValue("loan_amt", dom, "3"));
loanAmt = Double.parseDouble( checkNull(genericUtility.getColumnValueFromNode( "loan_amt", detail3List.item(ctr))).trim().length() == 0 ?"0": (genericUtility.getColumnValueFromNode( "loan_amt", detail3List.item(ctr))).trim() );
//adjAmt = Double.parseDouble(genericUtility.getColumnValue("adj_amt", dom, "3")== null?"0":genericUtility.getColumnValue("adj_amt", dom, "3"));
adjAmt = Double.parseDouble( checkNull(genericUtility.getColumnValueFromNode( "adj_amt", detail3List.item(ctr))).trim().length() == 0 ?"0": (genericUtility.getColumnValueFromNode( "adj_amt", detail3List.item(ctr))).trim() );
//monInst = Double.parseDouble(genericUtility.getColumnValue("mon_inst", dom, "3")== null?"0":genericUtility.getColumnValue("mon_inst", dom, "3"));
monInst = Double.parseDouble( checkNull(genericUtility.getColumnValueFromNode( "mon_inst", detail3List.item(ctr))).trim().length() == 0 ?"0": (genericUtility.getColumnValueFromNode( "mon_inst", detail3List.item(ctr))).trim() );
//interest = Double.parseDouble(genericUtility.getColumnValue("interest", dom, "3")== null?"0":genericUtility.getColumnValue("interest", dom, "3"));
interest = Double.parseDouble( checkNull(genericUtility.getColumnValueFromNode( "interest", detail3List.item(ctr))).trim().length() == 0 ?"0": (genericUtility.getColumnValueFromNode( "interest", detail3List.item(ctr))).trim() );
//schemeNo = genericUtility.getColumnValue("scheme_no", dom, "3");
schemeNo = genericUtility.getColumnValueFromNode( "scheme_no", detail3List.item(ctr) );
//lineNo = genericUtility.getColumnValue("line_no", dom, "3");
System.out.println("refNo::"+refNo+" adjAmt="+adjAmt+" schemeNo="+schemeNo);
if(genericUtility.getColumnValueFromNode( "start_date", detail3List.item(ctr) ) == null)
{
startDate = null;
}
else
{
startDate = simpleDateFormat.parse(genericUtility.getColumnValue("start_date", dom, "3"));
startDate = simpleDateFormat.parse(genericUtility.getColumnValueFromNode( "start_date", detail3List.item(ctr) ));
}
if(genericUtility.getColumnValue("end_date", dom, "3") == null)
if(genericUtility.getColumnValueFromNode( "end_date", detail3List.item(ctr) ) == null)
{
endDate = null;
}
else
{
endDate = simpleDateFormat.parse(genericUtility.getColumnValue("end_date", dom, "3"));
endDate = simpleDateFormat.parse(genericUtility.getColumnValueFromNode( "end_date", detail3List.item(ctr) ));
}
// update dw_payrv for voucher creation with loan amount adjusted in voucher detail
/*ll_crow = dw_payrv_det.insertrow(0)
dw_payrv_det.setitem(ll_crow, "ad_code", ls_loan_ad)
......@@ -580,7 +594,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.setTimestamp(12, currDate);
pstmt.setString(13, userId);
pstmt.setString(14, chgTerm);
pstmt.setString(15, "Through claim, " + adCode + " , on " + claimDate.toString());
pstmt.setString(15, "Through claim," + adCode + "," + claimDate.toString());
noRowInst = pstmt.executeUpdate();
System.out.println("no of row inserted loan_reco= "+noRowInst);
pstmt.close();
......@@ -592,11 +606,16 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
//if gf_loan_reco(ls_recono, dw_loan_reco) = -1 then
//421 ls_errcode = nvo_loan_reco.gbf_loan_reco_retrieve ( ls_recono, ls_recono, 1 )
errString = gbfLoanRecoRetrieve ( tranIdForLoan, tranIdForLoan, xtraParams,conn);
if(errString != null && errString.trim().length() == 0)
System.out.println("errString 608="+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
/*if(errString != null && errString.trim().length() == 0)
{
errString = itmDBAccess.getErrorString("","VMDLOANRECO","","",conn);
return errString;
}
}*/
}//parse Detail3 end Loan
/*else issue
if dw_loan_reco.update() <> 1 then
......@@ -608,7 +627,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{
//ls_errcode = gf_payroll_voucher(s_payr_hdr, dw_payrv_det, 'dw_claim')
errString = payrollVoucher(payHdr,payDetList, "dw_claim",xtraParams,conn);
System.out.println("614"+errString);
System.out.println("errString 625=="+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -817,7 +836,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
rs = pstmt.executeQuery();
while(rs.next())
{
recNo = rs.getString("recNo") == null?"":rs.getString("recNo") ;
recNo = rs.getString("reco_no") == null?"":rs.getString("reco_no") ;
sql = " update loan_reco set confirmed = 'Y', conf_date = ? ,emp_code__aprv = ? where reco_no = ? ";
pstmtUpt = conn.prepareStatement(sql);
......@@ -829,6 +848,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmtUpt = null;
//63 ls_errcode = gbf_post_loan_reco(ls_recono , 1)
errString = gbfPostLoanReco(recNo , xtraParams,conn);
System.out.println("847 errString= "+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -837,7 +857,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if(editOption != null && editOption.trim().equalsIgnoreCase("0"))
{
String dataStr = "";
/*String dataStr = "";
if ( "1".equals(editOption.trim()) )
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_loan_reco","reco_no");
......@@ -852,7 +872,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{
System.out.println("retString from batchload = ["+retString+"]");
}
}
}*/
}
......@@ -1475,6 +1495,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
try
{
System.out.println("gbfPostLoanReco called........... ");
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
currDate = new java.sql.Timestamp(System.currentTimeMillis());
genericUtility = GenericUtility.getInstance();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
......@@ -1551,7 +1572,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmtUpt.setDate(3, new java.sql.Date(confDate.getTime()));
pstmtUpt.setString(4,transer);
pstmtUpt.setString(5,refNo);
pstmtUpt.executeUpdate();
System.out.println("NO ROW UPDATE:"+pstmtUpt.executeUpdate());
pstmtUpt.close();
pstmtUpt = null;
}
......@@ -1560,8 +1581,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
sql = " select amt_bal from allowdedn_bal where ref_type = 'L' and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, transer);
pstmt.setString(2,loanNo);
pstmt.setString(1,loanNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -1572,10 +1592,12 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.close();
pstmt = null;
System.out.println(""+balanceAmt+"::"+recoAmt);
if(balanceAmt < recoAmt)
{
errString = "VPNOBAL1";
errString = itmDBAccess.getErrorString("","VPNOBAL1","","",conn);
return errString;
}
else
{//101
......@@ -1585,7 +1607,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmtUpt.setDouble(1,recoAmt);
pstmtUpt.setDouble(2,recoAmt);
pstmtUpt.setString(3,loanNo);
pstmtUpt.executeUpdate();
System.out.println("NO ROW UPDATE:"+pstmtUpt.executeUpdate());
pstmtUpt.close();
pstmtUpt = null;
}
......@@ -1598,17 +1620,19 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
rs = pstmt.executeQuery();
if(rs.next())
{
balanceAmt1 = rs.getDouble("amt_bal");
balanceAmt1 = rs.getDouble("balance_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
balanceAmt1 = balanceAmt1 - recoAmt ;
System.out.println("balanceAmt1="+balanceAmt1);
if(balanceAmt1 < 0)
{
errString = "VPNOBAL1";
errString = itmDBAccess.getErrorString("","VPNOBAL1","","",conn);
return errString;
}
if(balanceAmt1 > 0)
{
......@@ -1617,7 +1641,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmtUpt.setDouble(1,recoAmt);
pstmtUpt.setDate(2,recoDate == null?null:new java.sql.Date(recoDate.getTime()) );
pstmtUpt.setString(3,loanNo);
pstmtUpt.executeUpdate();
System.out.println("NO ROW UPDATE:"+pstmtUpt.executeUpdate());
pstmtUpt.close();
pstmtUpt = null;
}
......@@ -1629,7 +1653,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmtUpt.setDouble(1,recoAmt);
pstmtUpt.setDate(2,recoDate == null?null:new java.sql.Date(recoDate.getTime()) );
pstmtUpt.setString(3,loanNo);
pstmtUpt.executeUpdate();
System.out.println("NO ROW UPDATE:"+pstmtUpt.executeUpdate());
pstmtUpt.close();
pstmtUpt = null;
}
......@@ -1648,7 +1672,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmtUpt.setTimestamp(5,currDate);
pstmtUpt.setString(6,userId);
pstmtUpt.setString(7,chgTerm);
pstmtUpt.executeUpdate();
System.out.println("NO ROW UPDATE:"+pstmtUpt.executeUpdate());
pstmtUpt.close();
pstmtUpt = null;
......
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