From 0756a1f792e16c08efcba19fb55d46e5a74b1ad4 Mon Sep 17 00:00:00 2001
From: zhao_ll <zhao_ll@murongtech.com>
Date: Tue, 26 Jan 2021 16:14:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E4=BB=A3=E7=A0=812021012?=
 =?UTF-8?q?6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/cap/OBUICAP1/2040881_CTL.XML    | 43 +++++++++++++++++++++++++
 bui/etc/cap/OBUICAP1_CTL.XML            |  1 +
 bui/etc/cmm/OBUICMM2/BUI0022710_CTL.XML |  6 ++--
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 bui/etc/cap/OBUICAP1/2040881_CTL.XML

diff --git a/bui/etc/cap/OBUICAP1/2040881_CTL.XML b/bui/etc/cap/OBUICAP1/2040881_CTL.XML
new file mode 100644
index 0000000..c89380a
--- /dev/null
+++ b/bui/etc/cap/OBUICAP1/2040881_CTL.XML
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<Root>
+   <!--客户等级下拉列表查询-->
+   <Transaction code="2040881" log_switch="1">
+
+      <DynSentence name="QRY_CAPCUSINF_INF">
+         <Sentence>
+            SELECT RANK from CAPCUSINF GROUP BY RANK
+         </Sentence>
+      </DynSentence>        
+
+      <FlowCtrl>
+
+         <!--查询下拉列表-->
+         <Exec func="PUB:QueryInGroup" error="IGNORE">
+            <Arg name="SqlCmd" value="QRY_CAPCUSINF_INF"/>
+         </Exec>
+         <If condition="~RetCod=0">
+          <Exec func="PUB:GWASetMsg">
+            <Arg name="MsgCd" value="CAP00000" />
+         </Exec>
+         </If>
+         <ElseIf condition="~RetCod=2">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00023"/>
+               <Arg name="MsgDat" value="无数据"/>
+            </Exec>
+            <Return/>
+         </ElseIf>
+         <Else><!--数据库查询错误-->
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00021"/>
+               <Arg name="MsgDat" value="数据库错误"/>
+            </Exec>
+            <Return/>
+         </Else>
+         <Exec func="PUB:DumpETF" />
+
+
+      </FlowCtrl>
+   </Transaction>
+
+</Root>
diff --git a/bui/etc/cap/OBUICAP1_CTL.XML b/bui/etc/cap/OBUICAP1_CTL.XML
index 1da51e1..bc78752 100644
--- a/bui/etc/cap/OBUICAP1_CTL.XML
+++ b/bui/etc/cap/OBUICAP1_CTL.XML
@@ -140,5 +140,6 @@
    <Include file="etc/cap/OBUICAP1/2040878_CTL.XML" />  <!-- 未匹配风控规则客户信息查询 -->  
    <Include file="etc/cap/OBUICAP1/2040879_CTL.XML" />  <!-- 客户风控规则新增 -->  
    <Include file="etc/cap/OBUICAP1/2040880_CTL.XML" />  <!-- 客户风控规则解除 -->  
+   <Include file="etc/cap/OBUICAP1/2040881_CTL.XML" />  <!-- 客户登记下拉列表查询 -->  
    
 </Application>
diff --git a/bui/etc/cmm/OBUICMM2/BUI0022710_CTL.XML b/bui/etc/cmm/OBUICMM2/BUI0022710_CTL.XML
index 1dcecbf..8b1168a 100644
--- a/bui/etc/cmm/OBUICMM2/BUI0022710_CTL.XML
+++ b/bui/etc/cmm/OBUICMM2/BUI0022710_CTL.XML
@@ -6,15 +6,15 @@
          <Sentence>
              SELECT FIT_TRK,FIT_OFS,FIT_CTT,FIT_LEN,CRD_TRK,CRD_OFS,CRD_LEN,CRD_FLG,EXP_DT_FLG,CRD_NM,INT_MOD,U.BNK_TYP,U.TM_SMP,BNK_NM
              FROM CMMTUFIT  U LEFT JOIN CMMTBKTYP B ON U.BNK_TYP = B.BNK_TYP
-             WHERE (FIT_CTT LIKE ? OR ? IS NULL) 
+             WHERE ( (substr(?,0,FIT_LEN) = REPLACE(FIT_CTT,'F','') and crd_len = to_char(length(?))) OR ? IS NULL) 
                AND (CRD_FLG=? OR ? IS NULL)
                AND (BNK_NM LIKE ? OR ? IS NULL)
          </Sentence>
-         <Fields>FIT_CTT|FIT_CTT|CRD_FLG|CRD_FLG|BNK_NM|BNK_NM|</Fields>
+         <Fields>FIT_CTT|FIT_CTT|FIT_CTT|CRD_FLG|CRD_FLG|BNK_NM|BNK_NM|</Fields>
       </DynSentence>
       <FlowCtrl>
 
-          <Set>FIT_CTT=STRCAT("%",DELBOTHSPACE($FIT_CTT),"%")</Set>
+          <!--Set>FIT_CTT=STRCAT("%",DELBOTHSPACE($FIT_CTT),"%")</Set-->
           <Set>BNK_NM=STRCAT("%",DELBOTHSPACE($BNK_NM),"%")</Set>
 
          <!--生成多页查询数据集-->

From 2a9d4f0e4cdc9b54f6287895c20066a648d8eee5 Mon Sep 17 00:00:00 2001
From: zhao_ll <zhao_ll@murongtech.com>
Date: Tue, 26 Jan 2021 20:47:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/cap/OBUICAP1/2040875_CTL.XML | 51 ++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/bui/etc/cap/OBUICAP1/2040875_CTL.XML b/bui/etc/cap/OBUICAP1/2040875_CTL.XML
index 404913c..417ff6b 100644
--- a/bui/etc/cap/OBUICAP1/2040875_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040875_CTL.XML
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <Root>
-   <!--组信息修改-->
+   <!--风控组信息删除-->
    <Transaction code="2040875" log_switch="1">
 
       <DynSentence name="QRY_CUSLMTRLR_INF">
@@ -10,6 +10,22 @@
          <Fields>LMT_NM|</Fields>
       </DynSentence>
 
+      <!--是否存在生效用户使用该组-->
+      <DynSentence name="QRY_CAPCUSINF_INF">
+         <Sentence>
+            SELECT 'Y' YN FROM DUAL WHERE EXISTS (SELECT 'Y' YN FROM  CAPCUSINF  WHERE LMT_NM=? AND ENABLED='Y')
+         </Sentence>
+         <Fields>LMT_NM|</Fields>
+      </DynSentence>
+
+      <!--更新失效用户风控组-->
+      <DynSentence name="UPD_CAPCUSINF_INF">
+         <Sentence>
+           UPDATE  CAPCUSINF SET LMT_NM='DEFAULT' WHERE LMT_NM=? AND ENABLED='N'
+         </Sentence>
+         <Fields>LMT_NM|</Fields>
+      </DynSentence>
+
       <DynSentence name="DEL_CUSLMTRLR_INF">
          <Sentence>
             DELETE  FROM CUSLMTRLR WHERE LMT_NM=?
@@ -19,11 +35,41 @@
 
       <FlowCtrl>
 
-         <!--组信息新增-->
+         <!--组信息删除-->
          <Exec func="PUB:ReadRecord" error="IGNORE">
             <Arg name="SqlCmd"       value="QRY_CUSLMTRLR_INF"/>
          </Exec>
          <If condition="~RetCod=0">
+            <Exec func="PUB:ReadRecord" error="IGNORE">
+               <Arg name="SqlCmd"       value="QRY_CAPCUSINF_INF"/>
+            </Exec>
+            <If condition="~RetCod=0">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CAP00021"/>
+                  <Arg name="MsgDat" value="该风控规则存在生效用户"/>
+               </Exec>
+               <Return/>
+            </If>
+            <ElseIf condition="~RetCod=-1">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CAP00021"/>
+                  <Arg name="MsgDat" value="数据库错误"/>
+               </Exec>
+               <Return/>
+            </ElseIf>
+            
+            <!--更新该风控规则下的失效用户的风控规则为DEFAULT-->
+            <Exec func="PUB:ExecSql" error="IGNORE">
+               <Arg name="SqlCmd"    value="UPD_CAPCUSINF_INF"/>
+            </Exec>
+            <If condition="~RetCod=-1">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CAP00021"/>
+                  <Arg name="MsgDat" value="数据库错误"/>
+               </Exec>
+               <Return/>
+            </If>
+            
             <Exec func="PUB:ExecSql" error="IGNORE">
                <Arg name="SqlCmd"    value="DEL_CUSLMTRLR_INF"/>
             </Exec>
@@ -32,6 +78,7 @@
                   <Arg name="MsgCd" value="CAP00021"/>
                   <Arg name="MsgDat" value="数据库错误"/>
                </Exec>
+                <Exec func="PUB:RollbackWork" />
                <Return/>
             </If>
          </If>

From 1a9b80798d40e4eeed9d5b53b6ca573204828e2b Mon Sep 17 00:00:00 2001
From: zhao_ll <zhao_ll@murongtech.com>
Date: Wed, 27 Jan 2021 14:10:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=2020210127?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/cmm/OBUICMM1/4806432_CTL.XML | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bui/etc/cmm/OBUICMM1/4806432_CTL.XML b/bui/etc/cmm/OBUICMM1/4806432_CTL.XML
index 58c2f78..8343c93 100644
--- a/bui/etc/cmm/OBUICMM1/4806432_CTL.XML
+++ b/bui/etc/cmm/OBUICMM1/4806432_CTL.XML
@@ -6,7 +6,7 @@
 
       <DynSentence name="UPD_SMSTTMPS_INF">   <!-- 更新记录  -->
          <Sentence>
-          UPDATE SMSTTMPS SET SMS_TMP=?,REP_FLD=?,EFF_FLG=?,HNULL(RMK{4}=?),UPD_DT=?,UPD_TLR=?,SM_TYP=? WHERE SMS_CD=?                 
+          UPDATE SMSTTMPS SET SMS_TMP=?,REP_FLD=?,EFF_FLG=?,HNULL(RMK{4}=?),UPD_DT=?,HNULL(UPD_TLR{6}=?),SM_TYP=? WHERE SMS_CD=?                 
          </Sentence> 
          <Fields>SMS_TMP|REP_FLD|EFF_FLG|RMK|UPD_DT|UPD_TLR|SM_TYP|SMS_CD|</Fields>
       </DynSentence>