From 87a09e2770ed2af7d6bbb767108b73808bf78976 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 6 Jul 2022 20:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A5=E8=A1=8C=E7=94=B5=E5=AD=90=E5=9B=9E=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML | 3 ++-
 cap/etc/channel/cmb/QUERY_CMB.XML           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML b/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML
index 337836e..c53e49d 100644
--- a/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML
@@ -8,7 +8,8 @@
       <DynSentence name="QRY_CAPICBCJNLTOT_LST">
          <Sentence>
             SELECT * FROM (
-            SELECT ACCOUNT_NO,TRS_DATE  FROM CAPICBCJNLTOT WHERE ACC_RPT_STS='1' AND TOT_CNT!='0'   AND TRS_DATE &gt;=?)
+            SELECT ACCOUNT_NO,TRS_DATE  FROM CAPICBCJNLTOT WHERE ACC_RPT_STS='1' AND TOT_CNT!='0'   AND TRS_DATE &gt;=?   
+             AND ACCOUNT_NO IN (SELECT ACCT_NO ACCOUNT_NO  FROM CAPRECEIPTACCT WHERE RPT_SYC_FLG='Y'  AND BANK_CODE='ICBC'))
          </Sentence>
          <Fields>CHECK_DATE|</Fields>
       </DynSentence>
diff --git a/cap/etc/channel/cmb/QUERY_CMB.XML b/cap/etc/channel/cmb/QUERY_CMB.XML
index a321fda..6a67470 100644
--- a/cap/etc/channel/cmb/QUERY_CMB.XML
+++ b/cap/etc/channel/cmb/QUERY_CMB.XML
@@ -1145,7 +1145,7 @@
 
 
             <If condition="ISNULL(DELBOTHSPACE($PRINTID))">
-               <If condition="IS_NOEQUAL_STRING($begdat,$CHK_DAT)">
+               <If condition="IS_NOEQUAL_STRING($trs_dat,$CHK_DAT)">
                   <!--对于任务ID为空的情况认为查询不到对账单 一般此种情形 为整批次全部失败或退款-->
                   <Exec func="PUB:ExecSql" error="IGNORE">
                      <Arg name="SqlCmd"    value="UPD_CAPCMBHIJNL_FAIL"/>