From ec279ab9880fffdab960aebab80ca97668368002 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Fri, 2 Jul 2021 10:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML | 2 +-
 cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML      | 2 +-
 cap/etc/batch/BAT_GET_TIMER_CTL.XML        | 4 ++--
 cap/etc/batch/BAT_SEND_TIMER_CTL.XML       | 6 +++---
 cap/etc/scheduler/TIMCON_PUB.XML           | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
index 4853686..9d5d330 100644
--- a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
+++ b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
@@ -10,7 +10,7 @@
                 select listagg(dsk) WITHIN GROUP(ORDER BY dsk) dsk from
                 (select  '['||DSK_NAM||','||CORG_DSK_NO||','||BAT_STS||','||CORG_NO||']' dsk from CAPBATINF
                 where BAT_STS &lt;&gt; '4' and  BAT_STS &lt;&gt; '2'  and 
-                TO_CHAR(TO_DATE(snd_dt||snd_tm, 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
+                TO_CHAR(TO_DATE(decode(SND_DT||SND_TM,'  ',null,SND_DT||SND_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
             </Sentence>
             <Fields>MINUTE</Fields>
         </DynSentence>
diff --git a/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML
index d3b05ad..6edeee7 100644
--- a/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML
+++ b/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML
@@ -9,7 +9,7 @@
             <Sentence>
                 select listagg(DSK) WITHIN GROUP(ORDER BY DSK) DSK from
                 (select  '['||DSK_NO||','||DSK_STS||']' DSK from CAPDSKINF where dsk_sts &lt;&gt; '4' and
-                TO_CHAR(TO_DATE(rcv_dt||rcv_tm, 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
+                TO_CHAR(TO_DATE(decode(RCV_DT||RCV_TM,'  ',null,RCV_DT||RCV_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
             </Sentence>
             <Fields>MINUTE</Fields>
         </DynSentence>
diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML
index d56c618..25e90af 100644
--- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML
@@ -57,7 +57,7 @@
                         <Arg name="SqlCmd" value="QryBatLst"/>
                 </Exec>
                 <If condition="~RetCod=2">
-                        <Break/>
+                        <Return/>
                 </If>
                 <ElseIf condition="~RetCod&lt;0">
                         <Set>Rsp_Cd=80</Set>
@@ -73,7 +73,7 @@
                 <If condition="~RetCod&lt;0">
                         <Set>Rsp_Cd=80</Set>
                         <Set>Rsp_Msg="数据库错误"</Set>
-                        <Break/>
+                        <Return/>
                 </If>
                 <Exec func="PUB:CommitWork"/>
                 <Set>Rsp_Cd=STRCAT( , )</Set>
diff --git a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML
index b46f301..f9f97b6 100644
--- a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML
@@ -53,12 +53,12 @@
                         <Arg name="SqlCmd" value="QryBatInf"/>
                 </Exec>
                 <If condition="~RetCod=2">
-                        <Break/>
+                        <Return/>
                 </If>
                 <ElseIf condition="~RetCod&lt;0">
                         <Set>Rsp_Cd=80</Set>
                         <Set>Rsp_Msg="查询数据库错误"</Set>
-                        <Break/>
+                        <Return/>
                 </ElseIf>
                 <Set>TMP_SND_TIME=GETDATETIME()</Set>
                 <Set>N_SND_TIME=SUBSTR($TMP_SND_TIME,7,8)</Set>
@@ -71,7 +71,7 @@
             <If condition="~RetCod&lt;0">
                     <Set>Rsp_Cd=80</Set>
                     <Set>Rsp_Msg="数据库错误"</Set>
-                    <Break/>
+                    <Return/>
             </If>
             <Exec func="PUB:CommitWork"/>
 
diff --git a/cap/etc/scheduler/TIMCON_PUB.XML b/cap/etc/scheduler/TIMCON_PUB.XML
index 2134b69..85f64d4 100644
--- a/cap/etc/scheduler/TIMCON_PUB.XML
+++ b/cap/etc/scheduler/TIMCON_PUB.XML
@@ -38,11 +38,11 @@
      </CycleItem>
 
     <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='BAT_SEND_TIMER' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="65" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
-         <Data><ROOT><CORG_NO>CMB</CORG_NO><SND_TIME_INTERVAL>2</SND_TIME_INTERVAL><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
+         <Data><ROOT><CORG_NO>CMB</CORG_NO><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
      </CycleItem>
     
      <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='BAT_SEND_TIMER' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="65" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
-         <Data><ROOT><CORG_NO>ICBC</CORG_NO><SND_TIME_INTERVAL>2</SND_TIME_INTERVAL><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
+         <Data><ROOT><CORG_NO>ICBC</CORG_NO><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
      </CycleItem> 
 
      <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='BAT_GET_TIMER' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="65" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>