Skip to content

B
business-java
Commit 5e5aaea5 authored by pchavan's avatar pchavan
Browse files
Options

To Change the Condition compare with date. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190881 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 612ba8ac
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 32 deletions
webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java
View file @ 5e5aaea5
...@@ -129,6 +129,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -129,6 +129,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
Connection conn = null; Connection conn = null;
String userId = "",bankCode = ""; String userId = "",bankCode = "";
Date tranDate1,tranDate2; Date tranDate1,tranDate2;
Timestamp validDate= null;
try try
{ {
...@@ -236,7 +237,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -236,7 +237,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
String insertQuery = "", path = "", objName = "bank_reconciliation_wiz"; String insertQuery = "", path = "", objName = "bank_reconciliation_wiz";
String filterXml="",filterxml="",type=""; String filterXml="",filterxml="",type="";
String siteCode="",sql="",siteDescr="",bankName="",adpQuery="", bankCode= ""; String siteCode="",sql="",siteDescr="",bankName="",adpQuery="", bankCode= "",validupto="" ;
Timestamp validDate= null;
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
int currentFormNo = 0; int currentFormNo = 0;
NodeList parentNodeList = null; NodeList parentNodeList = null;
...@@ -248,13 +252,14 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -248,13 +252,14 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
// GenericUtility genericUtility = GenericUtility.getInstance(); // GenericUtility genericUtility = GenericUtility.getInstance();
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
SimpleDateFormat simpleDateFormat = null; SimpleDateFormat simpleDateFormat = null;
try try
{ {
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//conn.setAutoCommit(false); //conn.setAutoCommit(false);
conn = getConnection(); conn = getConnection();
connDriver = null; connDriver = null;
simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat()); simpleDateFormat = new SimpleDateFormat("DD-MM-YYYY");
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "userId"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "userId");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"); chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
...@@ -295,8 +300,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -295,8 +300,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//siteCode = checkNull(genericUtility.getColumnValue("site_code",dom)); //siteCode = checkNull(genericUtility.getColumnValue("site_code",dom));
bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom)); bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom));
System.out.println("bankCode :"+bankCode); //String validuptoDt = genericUtility.getColumnValue("valid_upto",dom);
//Added By PriyankaC on 14Sept2018
/*if(validuptoDt != null || validuptoDt.trim().length() ==0)
{
validupto = simpleDateFormat.parse(genericUtility.getColumnValue("valid_upto",dom));
}*/
System.out.println("bankCode :"+bankCode);
System.out.println("validupto in case 2 :"+validupto);
sql = "select site_code from bank where bank_code = ?"; sql = "select site_code from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode.trim()); pstmt.setString(1, bankCode.trim());
...@@ -386,7 +399,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -386,7 +399,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
AppConnectParm appConnect = new AppConnectParm(); AppConnectParm appConnect = new AppConnectParm();
ctx = new InitialContext(appConnect.getProperty()); ctx = new InitialContext(appConnect.getProperty());
bankCode = genericUtility.getColumnValue("bank_code",dom1); bankCode = genericUtility.getColumnValue("bank_code",dom1);
System.out.println("bankCode :"+bankCode); validupto = genericUtility.getColumnValue("valid_upto",dom1);
System.out.println("validupto :"+validupto);
validupto = genericUtility.getValidDateTimeString( validupto, "dd-MMM-yyyy",genericUtility.getDBDateFormat() );
System.out.println("validupto :"+validupto);
filterxml = genericUtility.getColumnValue("filter_xml", dom1); filterxml = genericUtility.getColumnValue("filter_xml", dom1);
System.out.println("filterxml :"+filterxml); System.out.println("filterxml :"+filterxml);
...@@ -394,8 +410,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -394,8 +410,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
type = checkNull(genericUtility.getColumnValue("type", dom1)); type = checkNull(genericUtility.getColumnValue("type", dom1));
System.out.println("type :"+type); System.out.println("type :"+type);
if("FILTER".equalsIgnoreCase(type)) if("FILTER".equalsIgnoreCase(type))
{ {
System.out.println("Running in filter.........."); System.out.println("Running in filter..........");
...@@ -434,8 +448,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -434,8 +448,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
pstmt = null; pstmt = null;
System.out.println("bankName :"+bankName); System.out.println("bankName :"+bankName);
valueXmlString.append("<Detail1>"); valueXmlString.append("<Detail1>");
valueXmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>"); valueXmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>");
valueXmlString.append("<bank_code><![CDATA[").append(bankCode).append("]]></bank_code>"); valueXmlString.append("<bank_code><![CDATA[").append(bankCode).append("]]></bank_code>");
...@@ -446,13 +458,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -446,13 +458,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
valueXmlString.append("<to_date><![CDATA[").append("").append("]]></to_date>"); valueXmlString.append("<to_date><![CDATA[").append("").append("]]></to_date>");
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,validupto,""));
valueXmlString.append("</Detail2>"); valueXmlString.append("</Detail2>");
System.out.println("valueXmlString (itemChanged)!!!!!!!!!:"+valueXmlString); System.out.println("valueXmlString (itemChanged)!!!!!!!!!:"+valueXmlString);
} }
} }
break; break;
case 3 : case 3 :
...@@ -579,10 +588,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -579,10 +588,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
String siteCode = "", bankCode = "",adpQuery=""; String siteCode = "", bankCode = "",adpQuery="",validupto="";
String resultString =""; String resultString ="";
try try
{ {
SimpleDateFormat simpleDateFormat = null;
simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//conn.setAutoCommit(false); //conn.setAutoCommit(false);
System.out.println("get TransDB connection in expenseReject : "+transDB); System.out.println("get TransDB connection in expenseReject : "+transDB);
...@@ -612,6 +624,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -612,6 +624,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("siteCode :"+siteCode); System.out.println("siteCode :"+siteCode);
bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom)); bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom));
System.out.println("bankCode :"+bankCode); System.out.println("bankCode :"+bankCode);
//Added By PriyankaC on 14Sept2018
validupto = genericUtility.getColumnValue("valid_upto",dom);
validupto = genericUtility.getValidDateTimeString( validupto, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() );
System.out.println("validupto :"+validupto);
/* /*
if(reconcileType.equalsIgnoreCase("filter")){ if(reconcileType.equalsIgnoreCase("filter")){
System.out.println("recon type:: " + reconcileType); System.out.println("recon type:: " + reconcileType);
...@@ -627,7 +643,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -627,7 +643,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,autoReconFilter); StringBuffer valueString = getXMLTransData(conn,adpQuery,insertQuery,objName,new StringBuffer(genericUtility.serializeDom(dom)),"CallByManually",reconcileType,siteCode,bankCode,validupto,autoReconFilter);
resultString = valueString.toString(); resultString = valueString.toString();
System.out.println("@@@@@@@resultString:1["+resultString+"]"); System.out.println("@@@@@@@resultString:1["+resultString+"]");
...@@ -666,12 +682,12 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -666,12 +682,12 @@ 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,String autoReconFilter) throws Exception private StringBuffer getXMLTransData(Connection conn, String sql, String insertSql, String objName, StringBuffer stringBuffer, String callBy,String reconcileType,String siteCode,String bankCode,String validupto,String autoReconFilter) throws Exception
{ {
ConnDriver connDriver1 = new ConnDriver(); ConnDriver connDriver1 = new ConnDriver();
Connection conn1=null; Connection conn1=null;
String siteCodeFr="",siteCodeTo=""; String siteCodeFr="",siteCodeTo="" , validuptoDt="" ;
StringBuffer valueXmlString = new StringBuffer(""); StringBuffer valueXmlString = new StringBuffer("");
HashMap<String,Double> bankStmtMap=new HashMap<String,Double>(); HashMap<String,Double> bankStmtMap=new HashMap<String,Double>();
...@@ -727,9 +743,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -727,9 +743,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("reconcileType :"+reconcileType); System.out.println("reconcileType :"+reconcileType);
System.out.println("siteCode :"+siteCode); System.out.println("siteCode :"+siteCode);
System.out.println("bankCode :"+bankCode); System.out.println("bankCode :"+bankCode);
System.out.println("validUpto :"+validupto);//PC
System.out.println("sql:"+sql); System.out.println("sql:"+sql);
System.out.println("insertSql:"+insertSql); System.out.println("insertSql:"+insertSql);
System.out.println("In First If!!!!!!!!!!!"); System.out.println("In First If!!!!!!!!!!!");
if ("CallByItemChange".equalsIgnoreCase(callBy) || "CallByFilter".equalsIgnoreCase(callBy)) if ("CallByItemChange".equalsIgnoreCase(callBy) || "CallByFilter".equalsIgnoreCase(callBy))
{ {
...@@ -738,7 +758,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -738,7 +758,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
if(callBy.equalsIgnoreCase("CallByItemChange")){ if(callBy.equalsIgnoreCase("CallByItemChange")){
System.out.println("itemchange:::"); System.out.println("itemchange:::");
sql = " select bs.TRAN_ID tran_id,bs.REF_NO ref_no," + /*
* sql = " select bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," + " to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," + " bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
" bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," + " bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," +
...@@ -750,9 +771,23 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -750,9 +771,23 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," + " bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" + " bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P')" ; " from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P')" ;
*/ //Changed By PriyankaC 0n 14-SEP-2018.
sql = " select bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
" bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," +
" to_char(bs.STAT_DATE,'DD-MON-YY') stat_date," +
" bs.STATUS status," +
//" bs.AMT_ADJ amt_adj," +
" 0 as amt_adj," +
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') and (bs.EFF_DATE) <=( ?)" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); // Added By PriyankaC on 14SEP2018
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
...@@ -779,6 +814,21 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -779,6 +814,21 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
/*sql = " select bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," +
" bt.TRAN_NO TRAN_NO_BT,bt.REF_NO ref_no," +
" to_char(bt.REF_DATE,'DD-MON-YY') ref_date," +
" bt.REF_MODE ref_mode," +
" bt.AMOUNT amount,bt.TRAN_TYPE tran_type,bt.ACCT_CODE acct_code," +
" bt.CCTR_CODE cctr_code,bt.SUNDRY_CODE sundry_code,bt.STATUS status ," +
" bt.REMARKS remarks," +
" 0 as amt_adj," +
//" bt.AMT_ADJ amt_adj," +
"bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ? ";*/ //Changed By PriyankaC on 14-SEP-2018.
sql = " select bt.TRAN_ID tran_id," + sql = " select bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," + " to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," + " bt.TRAN_SER TRAN_SER_BT," +
...@@ -793,10 +843,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -793,10 +843,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
"bt.SUNDRY_TYPE SUNDRY_TYPE_BT," + "bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " + " bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " + " banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') "; " bt.site_code=? and bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto));
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
...@@ -832,7 +883,20 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -832,7 +883,20 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("valueXmlString of CallByItemChange(getXMLTransData) :"+valueXmlString); System.out.println("valueXmlString of CallByItemChange(getXMLTransData) :"+valueXmlString);
}else{ }else{
System.out.println("filter::::"); System.out.println("filter::::");
//Change By PriyankaC on on 18-SEP-2018
/*sql = " select bs.site_code,bs.bank_code,bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
" bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," +
" to_char(bs.STAT_DATE,'DD-MON-YY') stat_date," +
" bs.STATUS status," +
//" bs.AMT_ADJ amt_adj," +
" 0 as amt_adj," +
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') " ;
*/
sql = " select bs.site_code,bs.bank_code,bs.TRAN_ID tran_id,bs.REF_NO ref_no," + sql = " select bs.site_code,bs.bank_code,bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," + " to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," + " bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
...@@ -844,13 +908,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -844,13 +908,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," + " to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," + " bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" + " bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P')" ; " from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') and (bs.EFF_DATE) <=( ?)" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto));//Added By PriyankaC on 18-SEP-2018
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
valueXmlString.append("<Detail>"); valueXmlString.append("<Detail>");
valueXmlString.append("<tran_name><![CDATA[").append("bankStatement").append("]]></tran_name>"); valueXmlString.append("<tran_name><![CDATA[").append("bankStatement").append("]]></tran_name>");
valueXmlString.append("<ref_no><![CDATA[").append(checkNull(rs.getString("ref_no"))).append("]]></ref_no>"); valueXmlString.append("<ref_no><![CDATA[").append(checkNull(rs.getString("ref_no"))).append("]]></ref_no>");
...@@ -876,6 +943,24 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -876,6 +943,24 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
//Change By PriyankaC on on 18-SEP-2018
/*sql = " select bt.site_code,bt.bank_code,bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," +
" bt.TRAN_NO TRAN_NO_BT,bt.REF_NO ref_no," +
" to_char(bt.REF_DATE,'DD-MON-YY') ref_date," +
" bt.REF_MODE ref_mode," +
" bt.AMOUNT amount,bt.TRAN_TYPE tran_type,bt.ACCT_CODE acct_code," +
" bt.CCTR_CODE cctr_code,bt.SUNDRY_CODE sundry_code,bt.STATUS status ," +
" bt.REMARKS remarks," +
" 0 as amt_adj," +
//" bt.AMT_ADJ amt_adj," +
"bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') ";*/
sql = " select bt.site_code,bt.bank_code,bt.TRAN_ID tran_id," + sql = " select bt.site_code,bt.bank_code,bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," + " to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," + " bt.TRAN_SER TRAN_SER_BT," +
...@@ -890,14 +975,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -890,14 +975,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
"bt.SUNDRY_TYPE SUNDRY_TYPE_BT," + "bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " + " bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " + " banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') "; " bt.site_code=? and bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); //Added By PriyankaC on 18-sep-2018
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
System.out.println("curr code:::::"+rs.getString("curr_code")); //System.out.println("curr code:::::"+rs.getString("curr_code"));
valueXmlString.append("<Detail>"); valueXmlString.append("<Detail>");
valueXmlString.append("<tran_name><![CDATA[").append("bankTransaction").append("]]></tran_name>"); valueXmlString.append("<tran_name><![CDATA[").append("bankTransaction").append("]]></tran_name>");
valueXmlString.append("<ref_no><![CDATA[").append(checkNull(rs.getString("ref_no"))).append("]]></ref_no>"); valueXmlString.append("<ref_no><![CDATA[").append(checkNull(rs.getString("ref_no"))).append("]]></ref_no>");
...@@ -956,7 +1043,20 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -956,7 +1043,20 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return valueXmlString; return valueXmlString;
} }
//Changed By PriyankaC on 18-SEP-2018.
/*sql = "select bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
" bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," +
" to_char(bs.STAT_DATE,'DD-MON-YY') stat_date," +
" bs.STATUS status," +
" 0 as amt_adj," +
//" bs.AMT_ADJ amt_adj," +
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') " ;
*/
sql = "select bs.TRAN_ID tran_id,bs.REF_NO ref_no," + sql = "select bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," + " to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
...@@ -969,10 +1069,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -969,10 +1069,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," + " to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," + " bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" + " bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P')" ; " from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') and eff_date <= ?" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); //Added By PriyankaC on 18-sep-2018.
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
...@@ -1157,6 +1260,23 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1157,6 +1260,23 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("@@@@@@@ RefBSHashMap["+RefBSHashMap+"]"); System.out.println("@@@@@@@ RefBSHashMap["+RefBSHashMap+"]");
System.out.println("@@@@@@@ tranIdBSMap["+tranIdBSMap+"]"); System.out.println("@@@@@@@ tranIdBSMap["+tranIdBSMap+"]");
//Changed By PriyankaC on 18-SEp-2018
/*sql = " select bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," +
" bt.TRAN_NO TRAN_NO_BT,bt.REF_NO ref_no," +
" to_char(bt.REF_DATE,'DD-MON-YY') ref_date," +
" bt.REF_MODE ref_mode," +
" bt.AMOUNT amount,bt.TRAN_TYPE tran_type,bt.ACCT_CODE acct_code," +
" bt.CCTR_CODE cctr_code,bt.SUNDRY_CODE sundry_code,bt.STATUS status ," +
" bt.REMARKS remarks," +
" 0 as amt_adj," +
//" bt.AMT_ADJ amt_adj," +
" bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P')";
*/
sql = " select bt.TRAN_ID tran_id," + sql = " select bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," + " to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," + " bt.TRAN_SER TRAN_SER_BT," +
...@@ -1171,10 +1291,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1171,10 +1291,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" bt.SUNDRY_TYPE SUNDRY_TYPE_BT," + " bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " + " bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " + " banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') "; " bt.site_code=? and bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); //Added By PriyankaC on 18-sep-2018.
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
...@@ -2901,7 +3022,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -2901,7 +3022,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
String tranId="",acctCode="",cctrCode="",prdCode="",acctPrd="",projCode="",chgDate=""; String tranId="",acctCode="",cctrCode="",prdCode="",acctPrd="",projCode="",chgDate="";
String compRef="",shName="",sundryName="",sundryDetails="",orgLocn="",billGpNoStr="",finEntity="",siteCodeFrDescr="",siteCodeToDescr=""; String compRef="",shName="",sundryName="",sundryDetails="",orgLocn="",billGpNoStr="",finEntity="",siteCodeFrDescr="",siteCodeToDescr="";
String sundrytype = "",exchRate = "",currCode="",bankName= ""; String sundrytype = "",exchRate = "",currCode="",bankName= "";
String resultString ="",sql = "", bankCode = "", bankCodeNew = ""; String resultString ="",sql = "", bankCode = "", validupto= "",bankCodeNew = "";
String siteCode = "", siteCodeNew = ""; String siteCode = "", siteCodeNew = "";
NodeList parentNodeList = null; NodeList parentNodeList = null;
Node parentNode = null; Node parentNode = null;
...@@ -2946,7 +3067,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -2946,7 +3067,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
bankCode = checkNull(genericUtility.getColumnValue("bank_code", dom)); bankCode = checkNull(genericUtility.getColumnValue("bank_code", dom));
System.out.println("bank code:::"+bankCode); System.out.println("bank code:::"+bankCode);
validupto = genericUtility.getColumnValue("valid_upto",dom1);
validupto = genericUtility.getValidDateTimeString( validupto, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() );
System.out.println("validupto :"+validupto);
sql = "select BANK_NAME from bank where bank_code = ?"; sql = "select BANK_NAME from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode.trim()); pstmt.setString(1, bankCode.trim());
...@@ -2967,7 +3090,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -2967,7 +3090,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
originalXmlStringBuff = originalXmlStringBuff.append("<?xml version = \"1.0\"?> <Root> <header> <editFlag>"); originalXmlStringBuff = originalXmlStringBuff.append("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
originalXmlStringBuff = originalXmlStringBuff.append("</editFlag> </header>"); originalXmlStringBuff = originalXmlStringBuff.append("</editFlag> </header>");
originalXmlStringBuff = originalXmlStringBuff.append(" <Detail1>"); originalXmlStringBuff = originalXmlStringBuff.append(" <Detail1>");
originalXmlStringBuff = originalXmlStringBuff.append(getXMLTransData(conn,"","","",new StringBuffer(""),"CallByFilter","",siteCode,bankCode,"")); originalXmlStringBuff = originalXmlStringBuff.append(getXMLTransData(conn,"","","",new StringBuffer(""),"CallByFilter","",siteCode,bankCode,validupto,""));
originalXmlStringBuff = originalXmlStringBuff.append("</Detail1>"); originalXmlStringBuff = originalXmlStringBuff.append("</Detail1>");
originalXmlStringBuff = originalXmlStringBuff.append("</Root>"); originalXmlStringBuff = originalXmlStringBuff.append("</Root>");
...@@ -4339,6 +4462,41 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -4339,6 +4462,41 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
} }
//PriyankaC
private Timestamp getTimeStamp(String dateStr) throws ITMException, Exception
{
String dbDateStr = "";
if(dateStr != null && !dateStr.equals(""))
{
if(dateStr.indexOf(":") != -1)
{
System.out.println("inside logic");
System.out.println("inside logic"+dateStr);
/* if(dateStr.indexOf(".") != -1)
{
dateStr = dateStr.substring(0, dateStr.indexOf("."));
}*/
return java.sql.Timestamp.valueOf(dateStr);
}
else
{
System.out.println("inside ");
dbDateStr =(new E12GenericUtility()).getValidDateTimeString(dateStr, (new E12GenericUtility()).getApplDateTimeFormat(), (new E12GenericUtility()).getDBDateTimeFormat());
return java.sql.Timestamp.valueOf(dbDateStr);
}
}
else
{
return null;
}
}
//
/*@Override /*@Override
public String getValuesForPopHelp(String sundryType) { public String getValuesForPopHelp(String sundryType) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
......
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