From 366557c73f564657b7d93c09b6120533a6a5ccbf Mon Sep 17 00:00:00 2001 From: Alawn Date: Mon, 15 Nov 2021 16:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=BA=A4?= =?UTF-8?q?=E6=98=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cap/etc/batch/ACCT_RECEIPT_QUERY.XML | 4 ++-- cap/etc/batch/CUST_RECEIPT_QUERY.XML | 4 ++-- cap/etc/batch/TRANS_QUERY.XML | 20 ++++++++++---------- cap/etc/channel/cmb/QUERY_CMB.XML | 8 ++++---- cap/etc/channel/icbc/QUERY_ICBC.XML | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cap/etc/batch/ACCT_RECEIPT_QUERY.XML b/cap/etc/batch/ACCT_RECEIPT_QUERY.XML index 2aac89f..7072b07 100644 --- a/cap/etc/batch/ACCT_RECEIPT_QUERY.XML +++ b/cap/etc/batch/ACCT_RECEIPT_QUERY.XML @@ -7,12 +7,12 @@ SELECT REF_NBR as BANK_REF_ID,YUR_REF as BATCH_ID,ACT_FIL_ID as FILE_PATH FROM CAPCMBHIJNL - WHERE TRS_DAT=? AND ACT_RPT_STS='1' + WHERE TRS_DAT=? AND ACT_RPT_STS='4' AND (DSK_NAM=? OR ? IS NULL) AND (REF_NBR=? OR ? IS NULL) AND (YUR_REF=? OR ? IS NULL) - TRANS_DATE|DISK_NO|BANK_REF_ID|BATCH_ID| + TRANS_DATE|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BATCH_ID|BATCH_ID| diff --git a/cap/etc/batch/CUST_RECEIPT_QUERY.XML b/cap/etc/batch/CUST_RECEIPT_QUERY.XML index feb117e..5a61390 100644 --- a/cap/etc/batch/CUST_RECEIPT_QUERY.XML +++ b/cap/etc/batch/CUST_RECEIPT_QUERY.XML @@ -7,12 +7,12 @@ SELECT REF_NBR as BANK_REF_ID,YUR_REF as BATCH_ID,BIL_FIL_ID as FILE_PATH FROM CAPCMBHIJNL - WHERE TRS_DAT=? AND BIL_RPT_STS='1' + WHERE TRS_DAT=? AND BIL_RPT_STS='4' AND (DSK_NAM=? OR ? IS NULL) AND (REF_NBR=? OR ? IS NULL) AND (YUR_REF=? OR ? IS NULL) - APPLY_DATE|DISK_NO|BANK_REF_ID|BATCH_ID| + APPLY_DATE|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BATCH_ID|BATCH_ID| diff --git a/cap/etc/batch/TRANS_QUERY.XML b/cap/etc/batch/TRANS_QUERY.XML index f9fb344..065da3c 100644 --- a/cap/etc/batch/TRANS_QUERY.XML +++ b/cap/etc/batch/TRANS_QUERY.XML @@ -29,8 +29,8 @@ TM_SMP AS REFRESH_TIME, vlt_dat AS BANK_VALUE_DATE FROM CAPCMBHIJNL - WHERE ACC_NBR=? AND TRS_DAT ? BETWEEN ? - AND (ety_dat||ety_tim) ? BETWEEN ? + WHERE ACC_NBR=? AND TRS_DAT BETWEEN ? AND ? + AND (ety_dat||ety_tim) BETWEEN ? AND ? AND (DSK_NAM=? OR ? IS NULL) AND (REF_NBR=? OR ? IS NULL) AND (YUR_REF=? OR ? IS NULL) @@ -66,7 +66,7 @@ vlt_dat AS BANK_VALUE_DATE FROM CAPCMBCURJNL WHERE ACC_NBR=? - AND (ety_dat||ety_tim) ? BETWEEN ? + AND (ety_dat||ety_tim) BETWEEN ? AND ? AND (DSK_NAM=? OR ? IS NULL) AND (REF_NBR=? OR ? IS NULL) AND (YUR_REF=? OR ? IS NULL) @@ -79,7 +79,7 @@ SELECT t_date AS BANK_TRANS_DATE, t_time AS BANK_TRANS_TIME, - drcrf AS BANK_DC_FLAG, + decode(drcrf,'1','D','2','C') AS BANK_DC_FLAG, recip_account_no AS ACCT_NO, recip_name AS ACCT_NAME, recip_bk_name AS BANK_NAME, @@ -101,8 +101,8 @@ TM_SMP AS REFRESH_TIME, value_date AS BANK_VALUE_DATE FROM CAPICBCHIJNL - WHERE ACCOUNT_NO=? AND TRS_DATE ? BETWEEN ? - AND (T_DATE||T_TIME) ? BETWEEN ? + WHERE ACCOUNT_NO=? AND TRS_DATE BETWEEN ? AND ? + AND (T_DATE||T_TIME) BETWEEN ? AND ? AND (DSK_NAM=? OR ? IS NULL) AND (ONLY_SEQUENCE=? OR ? IS NULL) AND (REF=? OR ? IS NULL) @@ -115,7 +115,7 @@ SELECT t_date AS BANK_TRANS_DATE, t_time AS BANK_TRANS_TIME, - drcrf AS BANK_DC_FLAG, + decode(drcrf,'1','D','2','C') AS BANK_DC_FLAG, recip_account_no AS ACCT_NO, recip_name AS ACCT_NAME, recip_bk_name AS BANK_NAME, @@ -138,7 +138,7 @@ value_date AS BANK_VALUE_DATE FROM CAPICBCCURJNL WHERE ACCOUNT_NO=? - AND (T_DATE||T_TIME) ? BETWEEN ? + AND (T_DATE||T_TIME) BETWEEN ? AND ? AND (DSK_NAM=? OR ? IS NULL) AND (ONLY_SEQUENCE=? OR ? IS NULL) AND (REF=? OR ? IS NULL) @@ -188,7 +188,7 @@ - + QRY_SQL=QRY_CAPCMBHIJNL_INF @@ -196,7 +196,7 @@ - + QRY_SQL=QRY_CAPICBCHIJNL_INF diff --git a/cap/etc/channel/cmb/QUERY_CMB.XML b/cap/etc/channel/cmb/QUERY_CMB.XML index 4c24f72..1ba0fa6 100644 --- a/cap/etc/channel/cmb/QUERY_CMB.XML +++ b/cap/etc/channel/cmb/QUERY_CMB.XML @@ -54,13 +54,13 @@ NVL((SELECT DSK_NAM FROM CAPBATINF B WHERE B.ORD_DT=A.TRS_DAT AND B.CORG_DSK_NO=A.YUR_REF - ),' ')),), + ),' '), L_POSTSCRIPT = NVL((SELECT C.POSTSCRIPT FROM CAPBATINF B,CAPDSKINF C WHERE B.ORD_DT=A.TRS_DAT AND B.CORG_DSK_NO=A.YUR_REF AND B.DSK_NAM=C.DSK_NAM - ),' ')),) + ),' ') WHERE ACC_NBR=? AND TRS_DAT=? AND A.YUR_REF!=' ' ACC_NBR|TRS_DAT| @@ -1377,13 +1377,13 @@ NVL((SELECT DSK_NAM FROM CAPBATINF B WHERE B.ORD_DT=A.TRS_DAT AND B.CORG_DSK_NO=A.YUR_REF - ),' ')),), + ),' '), L_POSTSCRIPT = NVL((SELECT C.POSTSCRIPT FROM CAPBATINF B,CAPDSKINF C WHERE B.ORD_DT=A.TRS_DAT AND B.CORG_DSK_NO=A.YUR_REF AND B.DSK_NAM=C.DSK_NAM - ),' ')),) + ),' ') WHERE ACC_NBR=? AND TRS_DAT=? AND A.YUR_REF!=' ' ACC_NBR|TRS_DAT| diff --git a/cap/etc/channel/icbc/QUERY_ICBC.XML b/cap/etc/channel/icbc/QUERY_ICBC.XML index 118f2bc..22f9571 100644 --- a/cap/etc/channel/icbc/QUERY_ICBC.XML +++ b/cap/etc/channel/icbc/QUERY_ICBC.XML @@ -60,7 +60,7 @@ NVL((SELECT C.POSTSCRIPT FROM CAPBATINF B,CAPDSKINF C WHERE B.ORD_DT=A.TRS_DATE AND B.CORG_DSK_NO=A.REF AND B.DSK_NAM=C.DSK_NAM - ),' ')),) + ),' ') WHERE ACCOUNT_NO=? AND TRS_DATE=? AND A.REF!=' ' ACCOUNT_NO|TRS_DATE| @@ -305,7 +305,7 @@ NVL((SELECT C.POSTSCRIPT FROM CAPBATINF B,CAPDSKINF C WHERE B.ORD_DT=A.TRS_DATE AND B.CORG_DSK_NO=A.REF AND B.DSK_NAM=C.DSK_NAM - ),' ')),) + ),' ') WHERE ACCOUNT_NO=? AND TRS_DATE=? AND A.REF!=' ' ACCOUNT_NO|TRS_DATE|