Skip to content

B
business-java
Commit 8fc54146 authored by cpatil's avatar cpatil
Browse files
Options

mahendra:combination of filter ref-date-amt 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100240 ce508802-f39f-4f6c-b175-0d175dae99d5
parent eb016915
Hide whitespace changes
Inline Side-by-side
Showing with 463 additions and 49 deletions
webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java
View file @ 8fc54146
...@@ -9,6 +9,7 @@ package ibase.webitm.ejb.fin; ...@@ -9,6 +9,7 @@ package ibase.webitm.ejb.fin;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ITMDBAccessLocal; import ibase.webitm.ejb.ITMDBAccessLocal;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
...@@ -31,6 +32,7 @@ import java.util.ArrayList; ...@@ -31,6 +32,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -47,7 +49,9 @@ import org.w3c.dom.NodeList; ...@@ -47,7 +49,9 @@ import org.w3c.dom.NodeList;
@Stateless @Stateless
public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, BankRecoWizICRemote { public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, BankRecoWizICRemote {
GenericUtility genericUtility = GenericUtility.getInstance(); //GenericUtility genericUtility = GenericUtility.getInstance();
//E12GenericUtility genericUtility = E12GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
String userId = null; String userId = null;
String chgUser = null; String chgUser = null;
String chgTerm = null; String chgTerm = null;
...@@ -430,7 +434,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -430,7 +434,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
valueXmlString.append("<bank_descr><![CDATA[").append(bankName).append("]]></bank_descr>"); valueXmlString.append("<bank_descr><![CDATA[").append(bankName).append("]]></bank_descr>");
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
valueXmlString.append("<Detail2>"); valueXmlString.append("<Detail2>");
valueXmlString.append(getXMLTransData(conn,adpQuery,"",objName,new StringBuffer(""),"CallByItemChange","",siteCode,bankCode)); valueXmlString.append(getXMLTransData(conn,adpQuery,"",objName,new StringBuffer(""),"CallByItemChange","",siteCode,bankCode,""));
valueXmlString.append("</Detail2>"); valueXmlString.append("</Detail2>");
System.out.println("valueXmlString (itemChanged)!!!!!!!!!:"+valueXmlString); System.out.println("valueXmlString (itemChanged)!!!!!!!!!:"+valueXmlString);
} }
...@@ -552,7 +556,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -552,7 +556,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return count; return count;
} }
public String preSaveForm(String xmlString1,String reconcileType)throws ITMException public String preSaveForm(String xmlString1,String reconcileType,String autoReconFilter)throws ITMException
{ {
Document dom = null; Document dom = null;
...@@ -568,9 +572,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -568,9 +572,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("call preSaveForm..........."); System.out.println("call preSaveForm...........");
System.out.println("xmlString1 (preSaveForm) :"+xmlString1); System.out.println("xmlString1 (preSaveForm) :"+xmlString1);
System.out.println("reconcileType(preSaveForm) :"+reconcileType); System.out.println("reconcileType(preSaveForm) :"+reconcileType);
System.out.println("autoReconFilter(preSaveForm)"+autoReconFilter);
if (xmlString1 != null && xmlString1.trim().length() > 0) if (xmlString1 != null && xmlString1.trim().length() > 0)
{ {
System.out.println("=====================================");
dom = GenericUtility.getInstance().parseString(xmlString1); dom = GenericUtility.getInstance().parseString(xmlString1);
siteCode = checkNull(genericUtility.getColumnValue("site_code",dom)); siteCode = checkNull(genericUtility.getColumnValue("site_code",dom));
System.out.println("siteCode :"+siteCode); System.out.println("siteCode :"+siteCode);
...@@ -586,7 +592,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -586,7 +592,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//System.out.println("adpQuery :"+adpQuery); //System.out.println("adpQuery :"+adpQuery);
StringBuffer valueString = getXMLTransData(conn,adpQuery,insertQuery,objName,new StringBuffer(genericUtility.serializeDom(dom)),"CallByManually",reconcileType,siteCode,bankCode); StringBuffer valueString = getXMLTransData(conn,adpQuery,insertQuery,objName,new StringBuffer(genericUtility.serializeDom(dom)),"CallByManually",reconcileType,siteCode,bankCode,autoReconFilter);
resultString = valueString.toString(); resultString = valueString.toString();
System.out.println("resultString :"+resultString); System.out.println("resultString :"+resultString);
//path = null; //path = null;
...@@ -617,7 +623,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -617,7 +623,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return resultString; return resultString;
} }
private StringBuffer getXMLTransData(Connection conn, String sql, String insertSql, String objName, StringBuffer stringBuffer, String callBy,String reconcileType,String siteCode,String bankCode) throws Exception private StringBuffer getXMLTransData(Connection conn, String sql, String insertSql, String objName, StringBuffer stringBuffer, String callBy,String reconcileType,String siteCode,String bankCode,String autoReconFilter) throws Exception
{ {
ConnDriver connDriver1 = new ConnDriver(); ConnDriver connDriver1 = new ConnDriver();
...@@ -636,6 +642,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -636,6 +642,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
List<String>tranIdBSList = new ArrayList<String>(); List<String>tranIdBSList = new ArrayList<String>();
List<String>tranIdBTList = new ArrayList<String>(); List<String>tranIdBTList = new ArrayList<String>();
List<Double>amtList = new ArrayList<Double>(); List<Double>amtList = new ArrayList<Double>();
Set<String>currSet = new HashSet<String>();
ArrayList<ArrayList> arrayListData = null; ArrayList<ArrayList> arrayListData = null;
arrayListData= new ArrayList<ArrayList> (); arrayListData= new ArrayList<ArrayList> ();
//ArrayList traceData = null; //ArrayList traceData = null;
...@@ -778,6 +785,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -778,6 +785,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
{ {
System.out.println("In Automatically reconcileType ....."); System.out.println("In Automatically reconcileType .....");
System.out.println("autoReconFilter:"+autoReconFilter);
rType ="A"; rType ="A";
System.out.println("xmlString(Automatically)!!!!!!! :"+stringBuffer.toString()); System.out.println("xmlString(Automatically)!!!!!!! :"+stringBuffer.toString());
...@@ -823,24 +831,128 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -823,24 +831,128 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
tempAmt = amtBS - amtAdjBS; tempAmt = amtBS - amtAdjBS;
System.out.println("tranTypeBS :"+tranTypeBS); System.out.println("tranTypeBS :"+tranTypeBS);
/*---------combination for ref_no and amount -------------------------*/
if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
if(RefBSHashMap.containsKey(refNoBS))
{
RefBSHashMap.put(refNoBS,RefBSHashMap.get(refNoBS) + tempAmt);
System.out.println("value will be :"+RefBSHashMap.get(refNoBS));
}
else
{
RefBSHashMap.put(refNoBS, tempAmt);
//System.out.println("refSer !!!!!!!!!!!!!"+refSer);
//System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBSMap.put(""+":"+refNoBS, refSer);
tranIdBSMap.put(""+"@"+refNoBS, tranIdBS);
System.out.println("get value!!!!!!!!!!!!"+tranIdBSMap.get(""+":"+refNoBS));
}
}
/*---------combination for ref_date and amount -------------------------*/
if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
if(RefBSHashMap.containsKey(refDateBS))
{
RefBSHashMap.put(refDateBS,RefBSHashMap.get(refDateBS) + tempAmt);
System.out.println("value will be :"+RefBSHashMap.get(refDateBS));
}
else
{
RefBSHashMap.put(refDateBS, tempAmt);
//System.out.println("refSer !!!!!!!!!!!!!"+refSer);
//System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBSMap.put(""+":"+refDateBS, refSer);
tranIdBSMap.put(""+"@"+refDateBS, tranIdBS);
System.out.println("get value!!!!!!!!!!!!"+tranIdBSMap.get(""+":"+refDateBS));
}
}
/*----------ref_no and ref_date and amount---------------------*/
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
{
if(RefBSHashMap.containsKey(refNoBS+":"+refDateBS))
{
RefBSHashMap.put(refNoBS+":"+refDateBS,RefBSHashMap.get(refNoBS+":"+refDateBS) + tempAmt);
System.out.println("value will be :"+RefBSHashMap.get(refNoBS+":"+refDateBS));
}
else
{
RefBSHashMap.put(refNoBS+":"+refDateBS, tempAmt);
//System.out.println("refSer !!!!!!!!!!!!!"+refSer);
//System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBSMap.put(""+":"+refNoBS+":"+refDateBS, refSer);
tranIdBSMap.put(""+"@"+refNoBS+":"+refDateBS, tranIdBS);
System.out.println("get value!!!!!!!!!!!!"+tranIdBSMap.get(""+":"+refDateBS));
}
}
/*----------------------------------------------------------*/
/*
if(RefBSHashMap.containsKey(refNoBS+":"+tranTypeBS)) if(RefBSHashMap.containsKey(refNoBS+":"+tranTypeBS))
{ {
RefBSHashMap.put(refNoBS+":"+tranTypeBS,RefBSHashMap.get(refNoBS+":"+tranTypeBS) + tempAmt);
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBSHashMap.put(refNoBS+":"+refDateBS,RefBSHashMap.get(refNoBS+":"+refDateBS) + tempAmt);
}
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBSHashMap.put(refNoBS,RefBSHashMap.get(refNoBS) + tempAmt);
}
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBSHashMap.put(refDateBS,RefBSHashMap.get(refDateBS) + tempAmt);
}
//RefBSHashMap.put(refNoBS+":"+tranTypeBS,RefBSHashMap.get(refNoBS+":"+tranTypeBS) + tempAmt);
System.out.println("value will be :"+RefBSHashMap.get(refNoBS+":"+tranTypeBS)); System.out.println("value will be :"+RefBSHashMap.get(refNoBS+":"+tranTypeBS));
} }
else else
{ {
RefBSHashMap.put(refNoBS+":"+tranTypeBS, tempAmt);
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBSHashMap.put(refNoBS+":"+refDateBS, tempAmt);
}
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBSHashMap.put(refNoBS, tempAmt);
}
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBSHashMap.put(refDateBS, tempAmt);
}
//RefBSHashMap.put(refNoBS+":"+tranTypeBS, tempAmt);
// currBSMap.put(refNoBS+":"+tranTypeBS, currCodeBS); // currBSMap.put(refNoBS+":"+tranTypeBS, currCodeBS);
System.out.println("refSer !!!!!!!!!!!!!"+refSer); System.out.println("refSer !!!!!!!!!!!!!"+refSer);
System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS); System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBSMap.put(siteCode+":"+refNoBS+":"+tranTypeBS, refSer); //tranIdBSMap.put(siteCode+":"+refNoBS+":"+tranTypeBS, refSer);
tranIdBSMap.put(siteCode+"@"+refNoBS+"@"+tranTypeBS, tranIdBS); //tranIdBSMap.put(siteCode+"@"+refNoBS+"@"+tranTypeBS, tranIdBS);
System.out.println("get value!!!!!!!!!!!!"+tranIdBSMap.get(siteCode+":"+refNoBS+":"+tranTypeBS)); tranIdBSMap.put(""+":"+refNoBS, refSer);
tranIdBSMap.put(""+"@"+refNoBS, tranIdBS);
System.out.println("get value!!!!!!!!!!!!"+tranIdBSMap.get(""+":"+refNoBS));
} }*/
}//end of while loop }//end of while loop
rs.close(); rs.close();
rs=null; rs=null;
...@@ -893,19 +1005,123 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -893,19 +1005,123 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
refDateBT = refDateBT.trim(); refDateBT = refDateBT.trim();
System.out.println("@"+refNoBT.length()); System.out.println("@"+refNoBT.length());
System.out.println("tranTypeBT :"+tranTypeBT); System.out.println("tranTypeBT :"+tranTypeBT);
/*---------combination for ref_no and amount -------------------------*/
if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
if(RefBTHashMap.containsKey(refNoBT))
{
RefBTHashMap.put(refNoBT,RefBTHashMap.get(refNoBT) + tempAmt);
System.out.println("value will be :"+RefBTHashMap.get(refNoBT));
}
else
{
RefBTHashMap.put(refNoBT, tempAmt);
//System.out.println("refSer !!!!!!!!!!!!!"+refSer);
//System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBTMap.put(""+":"+refNoBT, refSer);
tranIdBTMap.put(""+"@"+refNoBT, tranIdBT);
System.out.println("get value!!!!!!!!!!!!"+tranIdBTMap.get(""+":"+refNoBT));
}
}
/*---------combination for ref_date and amount -------------------------*/
if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
refDateBT=refDateBT.trim();
System.out.println("refDateBT"+refDateBT);
System.out.println("tempAmt:"+tempAmt);
if(RefBTHashMap.containsKey(refDateBT))
{
RefBTHashMap.put(refDateBT,RefBTHashMap.get(refDateBT) + tempAmt);
System.out.println("value will be :"+RefBTHashMap.get(refDateBT));
}
else
{
RefBTHashMap.put(refDateBT, tempAmt);
//System.out.println("refSer !!!!!!!!!!!!!"+refSer);
//System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBTMap.put(""+":"+refDateBT, refSer);
tranIdBTMap.put(""+"@"+refDateBT, tranIdBT);
System.out.println("get value!!!!!!!!!!!!"+tranIdBTMap.get(""+":"+refDateBT));
}
}
/*----------ref_no and ref_date and amount---------------------*/
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
{
if(RefBTHashMap.containsKey(refNoBT+":"+refDateBT))
{
RefBTHashMap.put(refNoBT+":"+refDateBT,RefBTHashMap.get(refNoBT+":"+refDateBT) + tempAmt);
System.out.println("value will be :"+RefBTHashMap.get(refNoBT+":"+refDateBT));
}
else
{
RefBTHashMap.put(refNoBT+":"+refDateBT, tempAmt);
//System.out.println("refSer !!!!!!!!!!!!!"+refSer);
//System.out.println(siteCode+":"+refNoBS+":"+tranTypeBS);
tranIdBSMap.put(""+":"+refNoBT+":"+refDateBT, refSer);
tranIdBSMap.put(""+"@"+refNoBT+":"+refDateBT, tranIdBT);
System.out.println("get value!!!!!!!!!!!!"+tranIdBSMap.get(""+":"+refDateBT));
}
}
/*----------------------------------------------------------*/
/*
if(RefBTHashMap.containsKey(refNoBT+":"+tranTypeBT)) if(RefBTHashMap.containsKey(refNoBT+":"+tranTypeBT))
{ {
RefBTHashMap.put(refNoBT+":"+tranTypeBT,RefBTHashMap.get(refNoBT+":"+tranTypeBT) + tempAmt);
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBTHashMap.put(refNoBT+":"+refDateBT,RefBTHashMap.get(refNoBT+":"+refDateBT) + tempAmt);
}
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBTHashMap.put(refNoBT,RefBTHashMap.get(refNoBT) + tempAmt);
}
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBTHashMap.put(refDateBT,RefBTHashMap.get(refDateBT) + tempAmt);
}
//RefBTHashMap.put(refNoBT+":"+tranTypeBT,RefBTHashMap.get(refNoBT+":"+tranTypeBT) + tempAmt);
System.out.println("value in bill :"+RefBTHashMap.get(refNoBT+":"+tranTypeBT)); System.out.println("value in bill :"+RefBTHashMap.get(refNoBT+":"+tranTypeBT));
} }
else else
{ {
RefBTHashMap.put(refNoBT+":"+tranTypeBT, tempAmt);
tranIdBTMap.put(siteCode+":"+refNoBT+":"+tranTypeBT, refSer); if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
tranIdBTMap.put(siteCode+"@"+refNoBT+"@"+tranTypeBT, tranIdBT); {
RefBTHashMap.put(refNoBT+":"+refDateBT, tempAmt);
}
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBTHashMap.put(refNoBT, tempAmt);
}
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
RefBTHashMap.put(refDateBT, tempAmt);
}
//RefBTHashMap.put(refNoBT+":"+tranTypeBT, tempAmt);
tranIdBTMap.put(""+":"+refNoBT, refSer);
tranIdBTMap.put(""+"@"+refNoBT, tranIdBT);
// currBTMap.put(refNoBT+":"+tranTypeBT, currCodeBT); // currBTMap.put(refNoBT+":"+tranTypeBT, currCodeBT);
} }
*/
}//end while loop }//end while loop
rs.close(); rs.close();
...@@ -934,16 +1150,85 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -934,16 +1150,85 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("currCdBS :::"+currCdBS); System.out.println("currCdBS :::"+currCdBS);
String currCdBT = currBTMap.get(entry.getKey()); String currCdBT = currBTMap.get(entry.getKey());
System.out.println("currCdBT :::"+currCdBT);*/ System.out.println("currCdBT :::"+currCdBT);*/
bankStmtMap.put(siteCodeFr +":"+entry.getKey(), lAmt); bankStmtMap.put("" +":"+entry.getKey(), lAmt);
System.out.println("bankStmtMap is :"+bankStmtMap); System.out.println("bankStmtMap is :"+bankStmtMap);
bankTntMap.put(siteCodeTo +":"+entry.getKey(), rAmt); bankTntMap.put("" +":"+entry.getKey(), rAmt);
System.out.println("reseiverSiteMap is :"+bankTntMap); System.out.println("reseiverSiteMap is :"+bankTntMap);
//if(lAmt == rAmt && currCdBS.equalsIgnoreCase(currCdBT)) //if(lAmt == rAmt && currCdBS.equalsIgnoreCase(currCdBT))
if(lAmt == rAmt) if(lAmt == rAmt)
{ {
System.out.println("amount is match (Automatic)!!!!!"); System.out.println("amount is match (Automatic)!!!!!");
arrayListData = buildTraceDataHM(bankStmtMap,bankTntMap,siteCode,siteCode,rType,tranIdBSMap,tranIdBTMap); //arrayListData = buildTraceDataHM(bankStmtMap,bankTntMap,siteCode,siteCode,rType,tranIdBSMap,tranIdBTMap,autoReconFilter);
System.out.println("arrayListData!!!"+arrayListData); //System.out.println("arrayListData!!!"+arrayListData);
System.out.println("key are!!! :"+entry.getKey());
tranIdBSList=listOfTranId(entry.getKey(),"bank_statement",autoReconFilter,siteCode,bankCode,conn);
System.out.println("tranIdBSList :"+tranIdBSList);
tranIdBTList=listOfTranId(entry.getKey(),"banktran_log",autoReconFilter,siteCode,bankCode,conn);
System.out.println("tranIdBTList :"+tranIdBTList);
///////////////////////////////////////////////////////////////////////////
System.out.println("tranIdBSList.size():"+tranIdBSList.size());
System.out.println("tranIdBTList.size():"+tranIdBTList.size());
if(tranIdBSList.size() > 1 && tranIdBTList.size() == 1)
{
for(int i = 0 ; i < tranIdBSList.size() ; i++)
{
ArrayList traceData = null;
traceData = new ArrayList();
System.out.println("multiple bank statement");
System.out.println(tranIdBSList.get(i));
System.out.println(tranIdBTList.get(0));
// System.out.println(amtList.get(i));
traceData.add(tranIdBTList.get(0));
traceData.add(tranIdBSList.get(i));
traceData.add(lAmt);
arrayListData.add(traceData);
}
}
if(tranIdBTList.size() > 1 && tranIdBSList.size() == 1)
{
for(int i = 0 ; i < tranIdBTList.size() ; i++)
{
System.out.println("before :"+arrayListData);
System.out.println(i);
ArrayList traceData = null;
traceData = new ArrayList();
System.out.println("multiple bank transcation!!!");
System.out.println(tranIdBSList.get(0));
System.out.println(tranIdBTList.get(i));
//System.out.println(amtList.get(i));
traceData.add(tranIdBTList.get(i));
traceData.add(tranIdBSList.get(0));
traceData.add(lAmt);
arrayListData.add(traceData);
System.out.println("after :"+arrayListData);
}
System.out.println("after for loop :"+arrayListData);
}
if(tranIdBTList.size() == 1 && tranIdBSList.size() == 1)
{
ArrayList traceData = null;
traceData = new ArrayList();
System.out.println("single transaction");
System.out.println(tranIdBSList.get(0));
System.out.println(tranIdBTList.get(0));
//System.out.println(amtList.get(0));
traceData.add(tranIdBTList.get(0));
traceData.add(tranIdBSList.get(0));
traceData.add(lAmt);
arrayListData.add(traceData);
}
////////////////////////////////////////////////////////////////////
} }
} }
...@@ -1056,7 +1341,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1056,7 +1341,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
tempAmtBS = amtBS - amtAdjBS; tempAmtBS = amtBS - amtAdjBS;
System.out.println("tempAmtBS in bank statement :"+tempAmtBS); System.out.println("tempAmtBS in bank statement :"+tempAmtBS);
currSet.add(currCodeBS);
tranIdBSList.add(tranIdBS.trim()); tranIdBSList.add(tranIdBS.trim());
//amtList.add(tempAmtBS); //amtList.add(tempAmtBS);
...@@ -1088,7 +1373,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1088,7 +1373,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
tranIdBTList.add(tranIdBT.trim()); tranIdBTList.add(tranIdBT.trim());
amtList.add(tempAmtBT); amtList.add(tempAmtBT);
currSet.add(currCodeBT);
if(tranTypeBT.equalsIgnoreCase("P")) if(tranTypeBT.equalsIgnoreCase("P"))
{ {
paymentAmt = paymentAmt + tempAmtBT; paymentAmt = paymentAmt + tempAmtBT;
...@@ -1119,7 +1404,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1119,7 +1404,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("calAmt :"+calAmt); System.out.println("calAmt :"+calAmt);
System.out.println("tempAmtBS :"+tempAmtBS); System.out.println("tempAmtBS :"+tempAmtBS);
if(calAmt == tempAmtBS) if(calAmt == tempAmtBS && currSet.size() == 1)
{ {
isReconcile = true; isReconcile = true;
System.out.println(isReconcile); System.out.println(isReconcile);
...@@ -1163,6 +1448,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1163,6 +1448,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
tranIdBSList.add(tranIdBS.trim()); tranIdBSList.add(tranIdBS.trim());
amtList.add(tempAmtBS); amtList.add(tempAmtBS);
System.out.println("tempAmtBS :"+tempAmtBS); System.out.println("tempAmtBS :"+tempAmtBS);
currSet.add(currCodeBS);
if(tranTypeBS.equalsIgnoreCase("P")) if(tranTypeBS.equalsIgnoreCase("P"))
{ {
...@@ -1198,6 +1486,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1198,6 +1486,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("tempAmt :"+tempAmt); System.out.println("tempAmt :"+tempAmt);
tranIdBTList.add(tranIdBT.trim()); tranIdBTList.add(tranIdBT.trim());
// amtList.add(tempAmtBT); // amtList.add(tempAmtBT);
currSet.add(currCodeBT);
}//end of bankTransaction }//end of bankTransaction
...@@ -1219,7 +1508,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1219,7 +1508,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("calAmt :"+calAmt); System.out.println("calAmt :"+calAmt);
System.out.println("tempAmtBT :"+tempAmtBT); System.out.println("tempAmtBT :"+tempAmtBT);
if(calAmt == tempAmtBT && calAmt != 0) if(calAmt == tempAmtBT && calAmt != 0 && currSet.size() == 1)
{ {
isReconcile = true; isReconcile = true;
System.out.println(isReconcile); System.out.println(isReconcile);
...@@ -1262,6 +1551,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1262,6 +1551,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
tempAmtBS = amtBS - amtAdjBS; tempAmtBS = amtBS - amtAdjBS;
tranIdBSList.add(tranIdBS.trim()); tranIdBSList.add(tranIdBS.trim());
amtList.add(tempAmtBS); amtList.add(tempAmtBS);
currSet.add(currCodeBS);
}//end of bankStatement }//end of bankStatement
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
...@@ -1290,6 +1581,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1290,6 +1581,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("tempAmt :"+tempAmt); System.out.println("tempAmt :"+tempAmt);
tranIdBTList.add(tranIdBT.trim()); tranIdBTList.add(tranIdBT.trim());
currSet.add(currCodeBT);
}//end of bankTransaction }//end of bankTransaction
...@@ -1298,7 +1591,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1298,7 +1591,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("tempAmtBT :"+tempAmtBT); System.out.println("tempAmtBT :"+tempAmtBT);
System.out.println("tempAmtBS :"+tempAmtBS); System.out.println("tempAmtBS :"+tempAmtBS);
if(tempAmtBT == tempAmtBS) if(tempAmtBT == tempAmtBS && currSet.size() == 1)
{ {
isReconcile = true; isReconcile = true;
} }
...@@ -1423,7 +1716,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1423,7 +1716,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("rowsInsertedWorkOrder......."); System.out.println("rowsInsertedWorkOrder.......");
conn.commit(); conn.commit();
System.out.println("arrayListData.size() :"+arrayListData.size()); System.out.println("arrayListData.size()!!!!! :"+arrayListData.size());
for (int itr = 0;itr < arrayListData.size();itr++) for (int itr = 0;itr < arrayListData.size();itr++)
{ {
System.out.println(">>>>execute update query!!!!!!!!!"); System.out.println(">>>>execute update query!!!!!!!!!");
...@@ -1524,7 +1817,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1524,7 +1817,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
} }
private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap,HashMap<String,Double> bankTranMap,String siteCodeFr,String siteCodeTo,String rType,HashMap<String,String> bankStmtRefMap,HashMap<String,String> bankTranRefMap) throws Exception private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap,HashMap<String,Double> bankTranMap,String siteCodeFr,String siteCodeTo,String rType,HashMap<String,String> bankStmtRefMap,HashMap<String,String> bankTranRefMap,String autoReconFilter) throws Exception
{ {
System.out.println("In buildTraceDataHM calling.........."); System.out.println("In buildTraceDataHM calling..........");
...@@ -1545,7 +1838,9 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -1545,7 +1838,9 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
double recAmt = 0,secondSite = 0; double recAmt = 0,secondSite = 0;
int leftcnt = 0, rightcnt = 0; int leftcnt = 0, rightcnt = 0;
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
try { boolean isBankTranData=false;
try
{
ArrayList traceData = null; ArrayList traceData = null;
if ( bankStmtMap != null && bankTranMap != null && bankStmtMap.size() > 0 && bankTranMap.size() > 0 ) if ( bankStmtMap != null && bankTranMap != null && bankStmtMap.size() > 0 && bankTranMap.size() > 0 )
{ {
...@@ -1560,30 +1855,75 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -1560,30 +1855,75 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
String[] keyArray = key.split(":"); String[] keyArray = key.split(":");
System.out.println("1:["+keyArray[0]+"]"); System.out.println("1:["+keyArray[0]+"]");
System.out.println("2:["+keyArray[1]+"]"); System.out.println("2:["+keyArray[1]+"]");
System.out.println("3:["+keyArray[2]+"]");
System.out.println("siteCodeFr :"+siteCodeFr); //System.out.println("3:["+keyArray[2]+"]");
System.out.println("siteCodeTo :"+siteCodeTo); //System.out.println("siteCodeFr :"+siteCodeFr);
//System.out.println("siteCodeTo :"+siteCodeTo);
System.out.println("autoReconFilter:"+autoReconFilter);
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter))
{
if(bankTranMap.containsKey(":"+keyArray[1].toString()+":"+keyArray[2].toString()))
{
tranIdStmt = bankStmtRefMap.get(""+"@"+keyArray[1].toString()+"@"+keyArray[2].toString());
System.out.println("tranIdStmt :"+tranIdStmt);
tranIdLog = bankTranRefMap.get(""+"@"+keyArray[1].toString()+"@"+keyArray[2].toString());
System.out.println("tranIdLog :"+tranIdLog);
isBankTranData=true;
}
}
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
if(bankTranMap.containsKey(":"+keyArray[1].toString()))
{
tranIdStmt = bankStmtRefMap.get(""+"@"+keyArray[1].toString());
System.out.println("tranIdStmt :"+tranIdStmt);
tranIdLog = bankTranRefMap.get(""+"@"+keyArray[1].toString());
System.out.println("tranIdLog :"+tranIdLog);
isBankTranData=true;
}
}
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter))
{
if(bankTranMap.containsKey(":"+keyArray[1].toString()))
{
tranIdStmt = bankStmtRefMap.get(""+"@"+keyArray[1].toString());
System.out.println("tranIdStmt :"+tranIdStmt);
tranIdLog = bankTranRefMap.get(""+"@"+keyArray[1].toString());
System.out.println("tranIdLog :"+tranIdLog);
isBankTranData=true;
}
}
System.out.println(bankStmtRefMap); System.out.println(bankStmtRefMap);
System.out.println("bankStmtRefMap size ....."+bankStmtRefMap.size()); System.out.println("bankStmtRefMap size ....."+bankStmtRefMap.size());
System.out.println(siteCodeTo+":"+keyArray[1].toString()+":"+keyArray[2].toString()); System.out.println(""+":"+keyArray[1].toString());
System.out.println(siteCodeFr+":"+keyArray[1].toString()+":"+keyArray[2].toString()); System.out.println(""+":"+keyArray[1].toString());
System.out.println("ref id from :"+siteCodeFr+"@"+keyArray[1].toString()+"@"+keyArray[2].toString());
System.out.println("ref id to :"+siteCodeTo+"@"+keyArray[1].toString()+"@"+keyArray[2].toString());
System.out.println("ref id from :"+""+"@"+keyArray[1].toString());
System.out.println("ref id to :"+""+"@"+keyArray[1].toString());
System.out.println("isBankTranData:"+isBankTranData);
if(bankTranMap.containsKey(":"+keyArray[1].toString()+":"+keyArray[2].toString())) //if(bankTranMap.containsKey(":"+keyArray[1].toString()))
if(isBankTranData)
{ {
recAmt = bankStmtMap.get(key); recAmt = bankStmtMap.get(key);
System.out.println("key : "+key); System.out.println("key : "+key);
System.out.println("recAmt : "+recAmt); System.out.println("recAmt : "+recAmt);
System.out.println("reseiverSiteMap :"+bankTranMap); System.out.println("reseiverSiteMap :"+bankTranMap);
System.out.println(" get key!!!!!!!!!" +":"+keyArray[1].toString()+":"+keyArray[2].toString()); System.out.println(" get key!!!!!!!!!" +":"+keyArray[1].toString());
System.out.println("issue get key :::"+":"+keyArray[1].toString()+":"+keyArray[2].toString()); System.out.println("issue get key :::"+":"+keyArray[1].toString());
secondSite = bankTranMap.get(":"+keyArray[1].toString()+":"+keyArray[2].toString()); //secondSite = bankTranMap.get(":"+keyArray[1].toString());
/*firstRefSer = bankStmtRefMap.get(":"+keyArray[1].toString()+":"+keyArray[2].toString()); /*firstRefSer = bankStmtRefMap.get(":"+keyArray[1].toString()+":"+keyArray[2].toString());
System.out.println("firstRefSer :"+firstRefSer); System.out.println("firstRefSer :"+firstRefSer);
...@@ -1591,16 +1931,16 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -1591,16 +1931,16 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
System.out.println("secondRefSer :"+secondRefSer);*/ System.out.println("secondRefSer :"+secondRefSer);*/
System.out.println("bankStmtRefMap :"+bankStmtRefMap); System.out.println("bankStmtRefMap :"+bankStmtRefMap);
System.out.println("!!!!"+siteCodeFr+"@"+keyArray[1].toString()+"@"+keyArray[2].toString()); System.out.println("!!!!"+""+"@"+keyArray[1].toString());
System.out.println("bankTranRefMap :"+bankTranRefMap); System.out.println("bankTranRefMap :"+bankTranRefMap);
System.out.println("@@@@@@"+siteCodeTo+"@"+keyArray[1].toString()+"@"+keyArray[2].toString()); System.out.println("@@@@@@"+""+"@"+keyArray[1].toString());
tranIdStmt = bankStmtRefMap.get(siteCodeFr+"@"+keyArray[1].toString()+"@"+keyArray[2].toString()); // tranIdStmt = bankStmtRefMap.get(""+"@"+keyArray[1].toString());
System.out.println("tranIdStmt :"+tranIdStmt); // System.out.println("tranIdStmt :"+tranIdStmt);
tranIdLog = bankTranRefMap.get(siteCodeTo+"@"+keyArray[1].toString()+"@"+keyArray[2].toString()); // tranIdLog = bankTranRefMap.get(""+"@"+keyArray[1].toString());
System.out.println("tranIdLog :"+tranIdLog); // System.out.println("tranIdLog :"+tranIdLog);
//
traceData = null; traceData = null;
...@@ -1966,6 +2306,11 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -1966,6 +2306,11 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
siteCode = checkNull(genericUtility.getColumnValue("site_code", dom)); siteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
System.out.println("siteCode :"+siteCode); System.out.println("siteCode :"+siteCode);
filterData= checkNull(genericUtility.getColumnValue("filter_data", dom)); filterData= checkNull(genericUtility.getColumnValue("filter_data", dom));
System.out.println("filRefId :"+filterData); System.out.println("filRefId :"+filterData);
...@@ -1973,6 +2318,10 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -1973,6 +2318,10 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
System.out.println("filterList :"+filterList); System.out.println("filterList :"+filterList);
filterXml.append("<Detail1>"); filterXml.append("<Detail1>");
filterXml.append("<from_tran_date>" + siteCode+ "</from_tran_date>"); filterXml.append("<from_tran_date>" + siteCode+ "</from_tran_date>");
filterXml.append("</Detail1>"); filterXml.append("</Detail1>");
...@@ -2178,7 +2527,7 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -2178,7 +2527,7 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<ref_date>" + refDate+ "</ref_date>"); filterXml.append("<ref_date>" + refDate+ "</ref_date>");
filterXml.append("<tran_type>" + tranType+ "</tran_type>"); filterXml.append("<tran_type>" + tranType+ "</tran_type>");
filterXml.append("<amt_bc>" + amtBc+ "</amt_bc>"); filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<curr_code>" + currCode+ "</curr_code>"); filterXml.append("<curr_code>" + currCode+ "</curr_code>");
filterXml.append("<amt_bs>" + amtBs+ "</amt_bs>"); filterXml.append("<amt_bs>" + amtBs+ "</amt_bs>");
filterXml.append("<tran_type>" + tranType+ "</tran_type>"); filterXml.append("<tran_type>" + tranType+ "</tran_type>");
...@@ -2346,6 +2695,71 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap ...@@ -2346,6 +2695,71 @@ private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap
} }
public List<String> listOfTranId(String key ,String tableName,String autoRecoFilter,String siteCode,String bankCode,Connection conn)
{
String sql="",refNo="",refDate="",tranId="";
PreparedStatement pstmt=null;
ResultSet rs=null;
List<String> tranIdList = new ArrayList<String>();
try
{
String[] keyArray = key.split(":");
sql = "SELECT tran_id from " + tableName + " where ";
if("REFNO_DATE_AMT".equalsIgnoreCase(autoRecoFilter))
{
refNo=keyArray[0].toString();
refDate=keyArray[1].toString();
sql = sql + " ref_no='"+refNo+"' and trim(ref_date)='"+refDate+"' ";
}
else if("REFNO_AMT".equalsIgnoreCase(autoRecoFilter))
{
refNo=keyArray[0].toString();
sql = sql + " ref_no='"+refNo+"' ";
}
else if("REFDATE_AMT".equalsIgnoreCase(autoRecoFilter))
{
refDate=keyArray[0].toString();
sql = sql + " trim(ref_date)='"+refDate+"' ";
}
sql = sql + "and site_code=? and bank_code=? and status in ('E', 'P')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
rs = pstmt.executeQuery();
while(rs.next())
{
tranId=rs.getString("tran_id");
tranIdList.add(tranId);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
catch(Exception e)
{
e.printStackTrace();
}
return tranIdList;
}
private String checkNull(String str) private String checkNull(String str)
{ {
......
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