更新字典表，增加缺少的查询条件，修改校验规则，修改下拉列表联动规则

DBScript/张奇凯/002-DML.sql

@@ -2649,3 +2649,35 @@ VALUES('riskCategory', '1', '
 INSERT INTO "sys_noun"
 ("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
 VALUES('riskCategory', 'riskCategory', '风险类型', 'BUSDICT', 2.000000000000000000000000000000, 0.000000000000000000000000000000, NULL, '0', '0', NULL, NULL, '1', '0');
+
+
+-- 贴现类型
+delete from sys_noun where NOUNITEM ='discountingType';
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('discountingType', '1', '贴现余额', 'discountingType', 3.000000000000000000000000000000, 1.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('discountingType', '2', '转入余额', 'discountingType', 3.000000000000000000000000000000, 2.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('discountingType', '3', '质押式逆回购余额', 'discountingType', 3.000000000000000000000000000000, 3.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('discountingType', '4', '买断式逆回购余额', 'discountingType', 3.000000000000000000000000000000, 4.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('discountingType', 'discountingType', '贴现类型', 'BUSDICT', 2.000000000000000000000000000000, 0.000000000000000000000000000000, NULL, '0', '0', NULL, NULL, '1', '0');
+
+
+-- 是否标志
+delete from sys_noun where NOUNITEM ='TORF';
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('TORF', 'F', '否', 'TORF', 3.000000000000000000000000000000, 2.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('TORF', 'T', '是', 'TORF', 3.000000000000000000000000000000, 1.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+INSERT INTO "sys_noun"
+("NOUNITEM", "NOUNVALUE", "NOUNNAME", "NOUNSUPER", "NOUNLEVEL", "NOUNORDER", "NOUNMODULE", "NOUNVALIDITY", "READONLY", "NOUNPROP", "NOUNREMARKS", "NOUNRELATION", "ORGFLAG")
+VALUES('TORF', 'TORF', '是否标志', 'BUSDICT', 2.000000000000000000000000000000, 0.000000000000000000000000000000, NULL, '0', '0', NULL, NULL, '1', '0');

Procedure/backend/project/src/main/java/com/sundata/product/rwa/dataquality/action/DataScopeManageAction.java

@@ -68,8 +68,8 @@ public class DataScopeManageAction  extends BaseAction {
                             @RequestBody TableRelationDefineModel model) {
         String sd = Arrays.toString(model.getEnglishSourceTableName());
         String sd2 = Arrays.toString(model.getEnglishTargetTableName());
-        String sd1 = sd.replace("[","").replace("]","");
-        String sd3 = sd2.replace("[","").replace("]","");
+        String sd1 = sd.replace("[","").replace("]","").replace(" ","");
+        String sd3 = sd2.replace("[","").replace("]","").replace(" ","");
         model.setEnglishSourceTableNames(sd1);
         model.setEnglishTargetTableNames(sd3);
         System.out.println(model);

Procedure/backend/project/src/main/java/com/sundata/product/rwa/dataquality/service/DataQualityRuleDefineService.java

@@ -51,7 +51,8 @@ public class DataQualityRuleDefineService {
      * @throws:
      */
     public void deleteRows(DataQualityRuleDefineModel model) {
-        if (null != model && StringUtil.isEmpty(model.getCheckRuleNo()) ) {
+        System.out.println(model.getCheckRuleNo());
+        if (null != model && StringUtil.isNotEmpty(model.getCheckRuleNo()) ) {
             dataQualityRuleDefineMapper.deleteRows(model);
         }
     }
@@ -65,7 +66,7 @@ public class DataQualityRuleDefineService {
      * @throws:
      */
     public void updateRowData(DataQualityRuleDefineModel model) {
-        if (null != model ) { // && FilesValueCheckUtils.checkStringValue(model.getCheckRuleNo())
+        if (null != model && StringUtil.isNotEmpty(model.getCheckRuleNo()) ) { // && FilesValueCheckUtils.checkStringValue(model.getCheckRuleNo())
             dataQualityRuleDefineMapper.updateRowData(model);
         }
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/datasupplementary/model/SupplementTaskDefineModel.java

@@ -37,6 +37,15 @@ public class SupplementTaskDefineModel {
 
     private String[] orgCodes;
     private String[] frequencys;
+    private String account1;
+
+    public String getAccount1() {
+        return account1;
+    }
+
+    public void setAccount1(String account1) {
+        this.account1 = account1;
+    }
 
     public String[] getOrgCodes() {
         return orgCodes;

Procedure/backend/project/src/main/java/com/sundata/product/rwa/datasupplementary/mybatis/SupplementTaskManagementMapper.xml

@@ -7,6 +7,7 @@
 
     <!-- 报表的初始化 -->
     <select id="getDataList" resultType="com.sundata.product.rwa.datasupplementary.model.SupplementTaskDefineModel">
+        SELECT  calcIndex,startDate,endDate,term,dataDate,taskCode,taskName,taskVersion,orgCode,ACCOUNT,frequency,adjustment,stageinId,status,GROUP_CONCAT (tmpNames) FROM (
         SELECT
         T1.CALCINDEX             AS   calcIndex,
         T1.SDATE                 AS   startDate,
@@ -57,7 +58,12 @@
             <if test="model.tmpNames !=null and model.tmpNames!=''">
                 and t3.TMPNAME like ('%'||#{model.tmpNames}||'%')
             </if>
+            <if test="model.account1 !=null and model.account1!=''">
+                and t3.TMPNAME like ('%'||#{model.account1}||'%')
+            </if>
         </where>
+        )
+        GROUP BY calcIndex,startDate,endDate,term,dataDate,taskCode,taskName,taskVersion,orgCode,ACCOUNT,frequency,adjustment,stageinId,status
     </select>
 
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/datasupplementary/mybatis/SupplementTemplateDefineMapper.xml

@@ -241,6 +241,10 @@
         select TASKCODE as id , TASKNAME as text from RWA_IMPUT_SUPTASKCONF_BASEINFO
     </select>
 
+    <select id="rowRange" resultType="com.sundata.admin.nounmanage.model.DictContent">
+        SELECT  T1.TMPCODE AS id, T2.TMPNAME AS text FROM RWA_IMPUT_SUPTASKCONF_RELATEDINFO T1
+        LEFT JOIN RWA_IMPUT_TMPCONF_BASEINFO T2 ON T1.TMPCODE = T2.TMPCODE
+    </select>
 
 
 </mapper>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/BondInvestmentMapper.java

@@ -1,12 +1,13 @@
 package com.sundata.product.rwa.interfacedatasheet.mapper;
 
 import com.sundata.product.rwa.interfacedatasheet.model.BondInvestmentModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface BondInvestmentMapper {
     // 初始化查询
-    public List<BondInvestmentModel> selectDataList (BondInvestmentModel model);
+    public List<BondInvestmentModel> selectDataList (@Param("model") BondInvestmentModel model);
     // 查询当前行
     public BondInvestmentModel selectRowData(String subjectNumber,String term);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/InterbankDepositOrLendingTableMapper.java

@@ -1,12 +1,13 @@
 package com.sundata.product.rwa.interfacedatasheet.mapper;
 
 import com.sundata.product.rwa.interfacedatasheet.model.InterbankDepositOrLendingTableModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface InterbankDepositOrLendingTableMapper {
     // 初始化查询
-    public List<InterbankDepositOrLendingTableModel> selectDataList (InterbankDepositOrLendingTableModel model);
+    public List<InterbankDepositOrLendingTableModel> selectDataList (@Param("model") InterbankDepositOrLendingTableModel model);
     // 查询当前行
     public InterbankDepositOrLendingTableModel selectRowData(String subjectNumber,String term);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/NonStandardInvestmentMapper.java

@@ -1,12 +1,13 @@
 package com.sundata.product.rwa.interfacedatasheet.mapper;
 
 import com.sundata.product.rwa.interfacedatasheet.model.NonStandardInvestmentModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface NonStandardInvestmentMapper {
     // 初始化查询
-    public List<NonStandardInvestmentModel> selectDataList (NonStandardInvestmentModel model);
+    public List<NonStandardInvestmentModel> selectDataList (@Param("model") NonStandardInvestmentModel model);
     // 查询当前行
     public NonStandardInvestmentModel selectRowData(String subjectNumber, String term);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/OffCreditCardMapper.java

@@ -1,12 +1,13 @@
 package com.sundata.product.rwa.interfacedatasheet.mapper;
 
 import com.sundata.product.rwa.interfacedatasheet.model.OffCreditCardModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface OffCreditCardMapper {
     // 初始化查询
-    public List<OffCreditCardModel> selectDataList (OffCreditCardModel model);
+    public List<OffCreditCardModel> selectDataList (@Param("model") OffCreditCardModel model);
     // 查询当前行
     public OffCreditCardModel selectRowData(String subjectNumber, String term);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/PledgeRelatedTableMapper.java

@@ -1,12 +1,13 @@
 package com.sundata.product.rwa.interfacedatasheet.mapper;
 
 import com.sundata.product.rwa.interfacedatasheet.model.PledgeRelatedTableModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface PledgeRelatedTableMapper {
     // 初始化查询
-    public List<PledgeRelatedTableModel> selectDataList (PledgeRelatedTableModel model);
+    public List<PledgeRelatedTableModel> selectDataList (@Param("model") PledgeRelatedTableModel model);
     // 查询当前行
     public PledgeRelatedTableModel selectRowData(PledgeRelatedTableModel model);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/CollateralTableModel.java

@@ -50,6 +50,16 @@ public class CollateralTableModel {
     // 是否第一顺位权
     private String ifFirstPriorityRight;
 
+    private String[] mitigationProdTypeCode;
+
+    public String[] getMitigationProdTypeCode() {
+        return mitigationProdTypeCode;
+    }
+
+    public void setMitigationProdTypeCode(String[] mitigationProdTypeCode) {
+        this.mitigationProdTypeCode = mitigationProdTypeCode;
+    }
+
     public String getCalcIndex() {
         return calcIndex;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/CustomerTableModel.java

@@ -28,7 +28,7 @@ public class CustomerTableModel {
     // 交易对手证件类型
     private String tradeCntrptyDocumentTypeDesc;
     // 交易对手证件号码
-    private String customerLicenceNo;
+    private String tradeCntrptyDocumentNo;
     // 企业规模代码
     private String[] entScaleCodes;
     // 企业规模代码
@@ -162,12 +162,12 @@ public class CustomerTableModel {
         this.tradeCntrptyDocumentTypeDesc = tradeCntrptyDocumentTypeDesc;
     }
 
-    public String getCustomerLicenceNo() {
-        return customerLicenceNo;
+    public String getTradeCntrptyDocumentNo() {
+        return tradeCntrptyDocumentNo;
     }
 
-    public void setCustomerLicenceNo(String customerLicenceNo) {
-        this.customerLicenceNo = customerLicenceNo;
+    public void setTradeCntrptyDocumentNo(String tradeCntrptyDocumentNo) {
+        this.tradeCntrptyDocumentNo = tradeCntrptyDocumentNo;
     }
 
     public String[] getEntScaleCodes() {

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/DiscountTableModel.java

@@ -85,6 +85,25 @@ public class DiscountTableModel {
     //客户名称
     private String clientName;
 
+    private String[] discountingTypes;
+    private String[] manageOrgnNos;
+
+    public String[] getManageOrgnNos() {
+        return manageOrgnNos;
+    }
+
+    public void setManageOrgnNos(String[] manageOrgnNos) {
+        this.manageOrgnNos = manageOrgnNos;
+    }
+
+    public String[] getDiscountingTypes() {
+        return discountingTypes;
+    }
+
+    public void setDiscountingTypes(String[] discountingTypes) {
+        this.discountingTypes = discountingTypes;
+    }
+
     public String getCalcIndex() {
         return calcIndex;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/BondInvestmentMapper.xml

@@ -43,10 +43,11 @@
         FAIR_VALUE_CHANGE_ACCOUNT_NO       AS    fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                 AS    reserveAccountNo,
         CORE_CLIENT_NO                     AS    coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RWA_BDM_BS_FF_SEC_POSIT
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+             and    DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.debtitemNo != null and '' != model.debtitemNo">
                 and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
@@ -74,8 +75,8 @@
             <if test="model.securityName != null and '' != model.securityName">
                 and SECURITY_NAME like concat(concat('%',#{model.securityName}),'%')
             </if>
-            order by DEBTITEM_NO ASC
         </where>
+        order by DEBTITEM_NO ASC
     </select>
 
 
@@ -118,28 +119,19 @@
         FAIR_VALUE_CHANGE_ACCOUNT_NO       AS    fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                 AS    reserveAccountNo,
         CORE_CLIENT_NO                     AS    coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RWA_BDM_BS_FF_SEC_POSIT
             <where>
+                1=1
                 <if test="null != #{term} and '' != #{term}">
-                    substr(DATA_DATE,1,6) = #{model.term}
-                </if>
-                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                    and PRIN_ACCOUNT_NO = #{subjectNumber}
+                 and   substr(DATA_DATE,1,6) = #{model.term}
                 </if>
                 <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    and ( PRIN_ACCOUNT_NO = #{subjectNumber}
                     or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
-                </if>
-                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                     or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
-                </if>
-                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                     or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
-                </if>
-                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                     or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
-                </if>
-                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                    or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                    or RESERVE_ACCOUNT_NO = #{subjectNumber} )
                 </if>
             </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/CollateralTableMapper.xml

@@ -30,11 +30,11 @@
         MITIGANT_TOOL_ORGIN_DATE                              AS   mitigantToolOrginDate,
         MITIGANT_TOOL_EXPIRY_DATE                             AS   mitigantToolExpiryDate,
         IF_FIRST_PRIORITY_RIGHT                               AS   ifFirstPriorityRight
-        from RWA_BUS_IT_FC_COLLATERAL
+        from RIM_APM_BS_FC_COLLATERAL_CST
         <where>
             1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+              and   DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.mitigationProdNo != null and '' != model.mitigationProdNo">
                 and MITIGATION_PROD_NO like concat(concat('%',#{model.mitigationProdNo}),'%')
@@ -48,6 +48,11 @@
             <if test="model.issuerName != null and '' != model.issuerName">
                 and ISSUER_NAME like concat(concat('%',#{model.issuerName}),'%')
             </if>
+            <if test="model.mitigationProdTypeCode != null and '' != model.mitigationProdTypeCode">
+                <foreach collection="model.mitigationProdTypeCode" item="item" open="and MITIGATION_PROD_TYPE_CODE  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             order by MITIGATION_PROD_NO ASC
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/CustomerTableMapper.xml

@@ -31,11 +31,11 @@
         INDUSTRY_NAME                                         AS     industryName,
         INDUSTRY_CODE                                         AS     industryCode,
         BELONG_GROUP_UNIFIED_CORE_CLIENT_NO                   AS     belongGroupUnifiedCoreClient_no
-        from RWA_BUS_IT_D_CUSTOMER
+        from RIM_APM_BS_D_CUSTOMER_INFO
         <where>
             1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                and DATA_DATE = model.dataDate
+                and DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.tradeCntrptyName != null and '' != model.tradeCntrptyName">
                 and TRADE_CNTRPTY_NAME like concat(concat('%',#{model.tradeCntrptyName}),'%')
@@ -61,8 +61,8 @@
                     #{item}
                 </foreach>
             </if>
-            order by CORE_CLIENT_NO ASC
         </where>
+        order by CORE_CLIENT_NO ASC
     </select>
 
 
@@ -92,7 +92,7 @@
         INDUSTRY_NAME                                         AS     industryName,
         INDUSTRY_CODE                                         AS     industryCode,
         BELONG_GROUP_UNIFIED_CORE_CLIENT_NO                   AS     belongGroupUnifiedCoreClient_no
-        from RWA_BUS_IT_D_CUSTOMER
+        from RIM_APM_BS_D_CUSTOMER_INFO
         <if test="null != model.businessType and '' != model.businessType">
             <where>
                 CUST_NAME = #{model.customerName}

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/DiscountTableMapper.xml

@@ -46,13 +46,14 @@
         ACCEPTOR_CLIENT_NO                             AS    acceptorClientNo,
         ACCEPTOR_CLIENT_NAME                           AS    acceptorClientName,
         CORE_CLIENT_NO                                 AS    coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RWA_BDM_BS_FF_DISCOUNT
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+             and    DATA_DATE = #{model.dataDate}
             </if>
-            <if test="model.loanReferenceNo != null and '' != model.loanReferenceNo">
-                and DEBTITEM_NO like concat(concat('%',#{model.loanReferenceNo}),'%')
+            <if test="model.debtitemNo != null and '' != model.debtitemNo">
+                and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
             </if>
             <if test="model.coreClientNo != null and '' != model.coreClientNo">
                 and CORE_CLIENT_NO like concat(concat('%',#{model.coreClientNo}),'%')
@@ -63,17 +64,21 @@
             <if test="model.clientName != null and '' != model.clientName">
                 and CLIENT_NAME like concat(concat('%',#{model.clientName}),'%')
             </if>
-            <if test="model.discountingType != null and '' != model.discountingType">
-                and DISCOUNTING_TYPE like concat(concat('%',#{model.discountingType}),'%')
+            <if test="model.discountingTypes != null and '' != model.discountingTypes">
+                <foreach collection="model.discountingTypes" item="item" open="and DISCOUNTING_TYPE  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
-            <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
-                and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')
+            <if test="model.manageOrgnNos != null and '' != model.manageOrgnNos">
+                <foreach collection="model.manageOrgnNos" item="item" open="and MANAGE_ORGN_NO in (" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')
             </if>
-            order by DEBTITEM_NO ASC
         </where>
+        order by DEBTITEM_NO ASC
     </select>
 
 
@@ -118,28 +123,19 @@
         ACCEPTOR_CLIENT_NO                             AS    acceptorClientNo,
         ACCEPTOR_CLIENT_NAME                           AS    acceptorClientName,
         CORE_CLIENT_NO                                 AS    coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RWA_BDM_BS_FF_DISCOUNT
         <where>
+            1=1
             <if test="null != #{term} and '' != #{term}">
-                substr(DATA_DATE,1,6) = #{model.term}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            and    substr(DATA_DATE,1,6) = #{model.term}
             </if>
             <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and ( PRIN_ACCOUNT_NO = #{subjectNumber}
                 or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                or RESERVE_ACCOUNT_NO = #{subjectNumber} )
             </if>
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/GuaranteeTableMapper.xml

@@ -21,10 +21,11 @@
         MITIGANT_EXPIRY_DATE                AS   mitigantExpiryDate,
         RELATED_DEBTITEM_NO                 AS   relatedDebtitemNo,
         GUARANTEE_AMT                       AS   guaranteeAmt
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_GUARENTEE
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+              and  DATA_DATE =#{model.dataDate}
             </if>
             <if test="model.mitigationProdNo != null and '' != model.mitigationProdNo">
                 and MITIGATION_PROD_NO like concat(concat('%',#{model.mitigationProdNo}),'%')
@@ -32,8 +33,10 @@
             <if test="model.mitigationProdName != null and '' != model.mitigationProdName">
                 and MITIGATION_PROD_NAME like concat(concat('%',#{model.mitigationProdName}),'%')
             </if>
-            <if test="model.mitigationProdType != null and '' != model.mitigationProdType">
-                and MITIGATION_PROD_TYPE like concat(concat('%',#{model.mitigationProdType}),'%')
+            <if test="model.mitigationProdTypes != null and '' != model.mitigationProdTypes">
+                <foreach collection="model.mitigationProdTypes" item="item" open="and MITIGATION_PROD_TYPE  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="model.guarantorTradeCntrptyName != null and '' != model.guarantorTradeCntrptyName">
                 and GUARANTOR_TRADE_CNTRPTY_NAME like concat(concat('%',#{model.guarantorTradeCntrptyName}),'%')
@@ -47,8 +50,8 @@
             <if test="model.relatedDebtitemNo != null and '' != model.relatedDebtitemNo">
                 and RELATED_DEBTITEM_NO like concat(concat('%',#{model.relatedDebtitemNo}),'%')
             </if>
-            order by MITIGATION_PROD_NO ASC
         </where>
+        order by MITIGATION_PROD_NO ASC
     </select>
 
     <select id="selectRowData" resultType="com.sundata.product.rwa.interfacedatasheet.model.GuaranteeTableModel" parameterType="com.sundata.product.rwa.interfacedatasheet.model.GuaranteeTableModel">
@@ -67,7 +70,7 @@
         MITIGANT_EXPIRY_DATE                AS   mitigantExpiryDate,
         RELATED_DEBTITEM_NO                 AS   relatedDebtitemNo,
         GUARANTEE_AMT                       AS   guaranteeAmt
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_GUARENTEE
              <where>
                 <if test="model.mitigationProdNo != null and '' != model.mitigationProdNo">
                     and MITIGATION_PROD_NO = #{model.mitigationProdNo}

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/InterbankDepositOrLendingTableMapper.xml

@@ -38,10 +38,11 @@
         INT_ADJ_ACCOUNT_NO                      AS     intAdjAccountNo,
         FAIR_VALUE_CHANGE_ACCOUNT_NO            AS     fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                      AS     reserveAccountNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RWA_BDM_BS_FF_IBOUT
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+                and DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.debtitemNo != null and '' != model.debtitemNo">
                 and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
@@ -60,8 +61,8 @@
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')
             </if>
-            order by DEBTITEM_NO ASC
         </where>
+        order by DEBTITEM_NO ASC
     </select>
     
 
@@ -98,28 +99,19 @@
         INT_ADJ_ACCOUNT_NO                      AS     intAdjAccountNo,
         FAIR_VALUE_CHANGE_ACCOUNT_NO            AS     fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                      AS     reserveAccountNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RWA_BDM_BS_FF_IBOUT
         <where>
+            1=1
             <if test="null != #{term} and '' != #{term}">
-                substr(DATA_DATE,1,6) = #{model.term}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                and PRIN_ACCOUNT_NO = #{subjectNumber}
+             and   substr(DATA_DATE,1,6) = #{model.term}
             </if>
             <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and ( PRIN_ACCOUNT_NO = #{subjectNumber}
                 or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                or RESERVE_ACCOUNT_NO = #{subjectNumber} )
             </if>
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/NonStandardInvestmentMapper.xml

@@ -40,10 +40,11 @@
         FAIR_VALUE_CHANGE_ACCOUNT_NO                 AS      fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                           AS      reserveAccountNo,
         CORE_CLIENT_NO                               AS      coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_SEC_POSIT_NCA
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+            and     DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.debtitemNo != null and '' != model.debtitemNo">
                 and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
@@ -65,8 +66,8 @@
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')
             </if>
-            order by DEBTITEM_NO ASC
         </where>
+        order by DEBTITEM_NO ASC
     </select>
 
 
@@ -106,28 +107,19 @@
         FAIR_VALUE_CHANGE_ACCOUNT_NO                 AS      fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                           AS      reserveAccountNo,
         CORE_CLIENT_NO                               AS      coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_SEC_POSIT_NCA
         <where>
+            1=1
             <if test="null != #{term} and '' != #{term}">
-                substr(DATA_DATE,1,6) = #{model.term}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                and PRIN_ACCOUNT_NO = #{subjectNumber}
+             and   substr(DATA_DATE,1,6) = #{model.term}
             </if>
             <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and ( PRIN_ACCOUNT_NO = #{subjectNumber}
                 or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                or RESERVE_ACCOUNT_NO = #{subjectNumber} )
             </if>
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OffCreditCardMapper.xml

@@ -43,11 +43,11 @@
         ACCORD_STANDARD_UNUSE_LIMIT_LABEL              AS    accordStandardUnuseLimitLabel,
         QUALIFIED_TRADERS_FLAG                         AS    qualifiedTradersFlag,
         CORE_CLIENT_NO                                 AS    coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_OFF_CARD_CCS
         <where>
             1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+               and  DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.coreClientNo != null and '' != model.coreClientNo">
                 and CORE_CLIENT_NO like concat(concat('%',#{model.coreClientNo}),'%')
@@ -72,8 +72,8 @@
             <if test="model.accordStandardUnuseLimitLabel != null and '' != model.accordStandardUnuseLimitLabel">
                 and ACCORD_STANDARD_UNUSE_LIMIT_LABEL like concat(concat('%',#{model.accordStandardUnuseLimitLabel}),'%')
             </if>
-            order by CRM_NO ASC
         </where>
+        order by CORE_CLIENT_NO ASC
     </select>
 
 
@@ -115,28 +115,19 @@
         ACCORD_STANDARD_UNUSE_LIMIT_LABEL              AS    accordStandardUnuseLimitLabel,
         QUALIFIED_TRADERS_FLAG                         AS    qualifiedTradersFlag,
         CORE_CLIENT_NO                                 AS    coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_OFF_CARD_CCS
         <where>
+            1=1
             <if test="null != #{term} and '' != #{term}">
-                substr(DATA_DATE,1,6) = #{model.term}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                and PRIN_ACCOUNT_NO = #{subjectNumber}
+             and   substr(DATA_DATE,1,6) = #{model.term}
             </if>
             <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and ( PRIN_ACCOUNT_NO = #{subjectNumber}
                 or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                or RESERVE_ACCOUNT_NO = #{subjectNumber} )
             </if>
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OnCreditCardMapper.xml

@@ -44,10 +44,11 @@
         FIVE_CLASS_DESC                                 AS   fiveClassDesc,
         QUALIFIED_TRADERS_FLAG                          AS   qualifiedTradersFlag,
         CORE_CLIENT_NO                                  AS   coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_ON_CARD_CCS
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+              and   DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.debtitemNo != null and '' != model.debtitemNo">
                 and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
@@ -69,8 +70,8 @@
                     #{item}
                 </foreach>
             </if>
-            order by DEBTITEM_NO ASC
         </where>
+        order by DEBTITEM_NO ASC
     </select>
 
 
@@ -113,28 +114,19 @@
         FIVE_CLASS_DESC                                 AS   fiveClassDesc,
         QUALIFIED_TRADERS_FLAG                          AS   qualifiedTradersFlag,
         CORE_CLIENT_NO                                  AS   coreClientNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_ON_CARD_CCS
         <where>
+            1=1
             <if test="null != #{term} and '' != #{term}">
-                substr(DATA_DATE,1,6) = #{model.term}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            and    substr(DATA_DATE,1,6) = #{model.term}
             </if>
             <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and ( PRIN_ACCOUNT_NO = #{subjectNumber}
                 or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
                 or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
-            </if>
-            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
-                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                or RESERVE_ACCOUNT_NO = #{subjectNumber})
             </if>
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/PledgeRelatedTableMapper.xml

@@ -15,11 +15,11 @@
         MITIGANT_CONTRACT_NO           AS   mitigantContractNo,
         CONTRACT_NO                    AS   contractNo,
         DEBTITEM_NO                    AS   debtitemNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_PLEDGE_LINK
         <where>
             1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                and DATA_DATE = model.dataDate
+                and DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.mitigationProdNo != null and '' != model.mitigationProdNo">
                 and MITIGATION_PROD_NO like concat(concat('%',#{model.mitigationProdNo}),'%')
@@ -33,8 +33,8 @@
             <if test="model.debtitemNo != null and '' != model.debtitemNo">
                 and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
             </if>
-            order by MITIGATION_PROD_NO ASC
         </where>
+        order by MITIGATION_PROD_NO ASC
     </select>
 
 
@@ -48,7 +48,7 @@
         MITIGANT_CONTRACT_NO           AS   mitigantContractNo,
         CONTRACT_NO                    AS   contractNo,
         DEBTITEM_NO                    AS   debtitemNo
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FC_PLEDGE_LINK
         <if test="null != model.mitigationProdNo and '' != model.mitigationProdNo">
             <where>
                 MITIGATION_PROD_NO = #{model.mitigationProdNo}

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/RepoRelatedTableMapper.xml

@@ -22,10 +22,11 @@
         ISSUER_NAME                            AS    issuerName,
         MITIGANT_ORGIN_DATE                    AS    mitigantOrginDate,
         MITIGANT_EXPIRY_DATE                   AS    mitigantExpiryDate
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FF_REPO_LINK
         <where>
+            1=1
             <if test="model.dataDate != null and '' != model.dataDate">
-                 DATA_DATE = model.dataDate
+                and DATA_DATE = #{model.dataDate}
             </if>
             <if test="model.mitigationProdNo != null and '' != model.mitigationProdNo">
                 and MITIGATION_PROD_NO like concat(concat('%',#{model.mitigationProdNo}),'%')
@@ -42,8 +43,8 @@
             <if test="model.debtitemNo != null and '' != model.debtitemNo">
                 and DEBTITEM_NO like concat(concat('%',#{model.debtitemNo}),'%')
             </if>
-            order by MITIGATION_PROD_NO ASC
         </where>
+        order by MITIGATION_PROD_NO ASC
     </select>
 
     <!-- 查询当前行 -->
@@ -64,7 +65,7 @@
         ISSUER_NAME                            AS    issuerName,
         MITIGANT_ORGIN_DATE                    AS    mitigantOrginDate,
         MITIGANT_EXPIRY_DATE                   AS    mitigantExpiryDate
-        from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
+        from RIM_APM_BS_FF_REPO_LINK
         <if test="null != #{model.mitigationProdNo} and '' != #{model.mitigationProdNo}">
             <where>
                 MITIGATION_PROD_NO = #{model.mitigationProdNo}

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FaGlBalanceSheetMapper.xml

@@ -15,13 +15,13 @@
         T1.ACCOUNT_NAME as accountName,
         T1.DEBTOR_BAL as debtorBal,
         T1.CREDITOR_BAL as creditorBal
-        from  RIM_TDM_BS_FA_GL_BALANCE_SHEET_GL T1
+        from  RIM_APM_BS_FA_GL_BALANCE_SHEET_GL T1
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and T1.DATA_DATE = replace(#{dataDate},'-','')
         </if>
 
-        <if test="accountNo !='' and accountNo!=null">
+        <if test="accountNo !='' and accountNo!=null">CollateralTable
             and T1.ACCOUNT_NO like concat ('%',#{accountNo},'%')
         </if>
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcCommitmentMapper.xml

@@ -45,7 +45,7 @@
         T1.BELONG_LINE_DESC as belongLineDesc,
         T1.COMMITMENT_TYPE as commitmentTypes,
         T1.COMMITMENT_TYPE_DESC as commitmentTypeDesc
-        FROM  RIM_TDM_BS_FC_COMMITMENT_CBS T1
+        FROM  RIM_APM_BS_FC_COMMITMENT_CBS T1
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and T1.DATA_DATE = replace(#{dataDate},'-','')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcOffSheetMapper.xml

@@ -80,9 +80,9 @@
              WHEN T1.LG_OR_NON_LG_LABEL ='NO' THEN '非融资'
              ELSE NULL
              END AS lgOrNonLgLabelDesc,
-        T1.ISSUE_DATE as issueDate,
-        T1.DATA_SRC_TABLE as dataSrcTable
-        from  RIM_APM_BS_FC_OFF_SHEET T1
+        T1.ISSUE_DATE as issueDate
+       -- T1.DATA_SRC_TABLE as dataSrcTable
+        from  RWA_BDM_BS_FC_OFF_SHEET T1
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and T1.DATA_DATE = replace(#{dataDate},'-','')
@@ -198,8 +198,8 @@
         WHEN T1.LG_OR_NON_LG_LABEL ='NO' THEN '非融资'
         ELSE NULL
         END AS lgOrNonLgLabelDesc,
-        T1.ISSUE_DATE as issueDate,
-        T1.DATA_SRC_TABLE as dataSrcTable
+        T1.ISSUE_DATE as issueDate
+        -- T1.DATA_SRC_TABLE as dataSrcTable
         from  RIM_APM_BS_FC_OFF_SHEET T1
         where 1=1
         and T1.PRIN_ACCOUNT_NO =#{subjectNumber}

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FfRepoMapper.xml

@@ -52,7 +52,7 @@
              WHEN T1.CORE_MARKET_PARTICIPANT_FLAG = 'F' THEN '否'
              ELSE NULL
              END AS coreMarketParticipantFlagDesc
-        FROM  RIM_TDM_BS_FF_REPO_CTS T1
+        FROM  RIM_APM_BS_FF_REPO_CTS T1
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and T1.DATA_DATE = replace(#{dataDate},'-','')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/ItItfRateMapper.xml

@@ -12,7 +12,7 @@
         T1.CCY as ccys,
         T1.EXRATE as exrate,
         T2.NOUNNAME  AS ccyDesc
-        from  RIM_TDM_BS_ITF_RATE_GL T1
+        from  RIM_APM_BS_ITF_RATE_GL T1
         LEFT JOIN SYS_NOUN  T2  ON T1.CCY =T2.NOUNVALUE  AND  T2.NOUNITEM ='currCd'
         where 1=1
         <if test="dataDate !='' and dataDate!=null">

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/mybatis/InfoListMapper.xml

@@ -6,7 +6,7 @@
     <select id="getFunTree1" resultType="com.sundata.admin.nounmanage.model.DictContent">
          select OFFOBJECT_NO as id ,OFFOBJECT_NAME as text ,OFFOBJECT_SUPER as parentid,YESORNO as attributes
         from RWA_CALC_CONF_OFFBALANCEPROTYPE
-        order by OFFOBJECT_SUPER,OFFOBJECT_NO
+        order by NVL(OFFOBJECT_SUPER,0),OFFOBJECT_NO
     </select>
 
     <select id="queryButtons" resultType="com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.model.RwaCalcConfOffbalanceprotyperuleModel">
@@ -179,6 +179,9 @@
         <if test="defaultOut !='' and defaultOut !=null" >
             where 1=1 and t1.STEP_STAGE_ID = #{defaultOut}
         </if>
+        <if test="defaultOut == null  or defaultOut ==''">
+            where 1=2
+        </if>
     </select>
 
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/action/InfoAction.java

@@ -1,6 +1,7 @@
 package com.sundata.product.rwa.rwacalcconfig001riskexposure.action;
 
 import com.sundata.admin.nounmanage.model.DictTree;
+import com.sundata.common.annotation.SysLog;
 import com.sundata.common.base.BaseAction;
 
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureClassRuleModel;
@@ -165,4 +166,11 @@ public class InfoAction extends BaseAction {
         }
     }
 
+    @RequestMapping({"getoffobjectStageId"})
+    @SysLog(funcName="获取根目录选择的阶段信息配置")
+    public void getoffobjectStageId(HttpServletRequest request, HttpServletResponse response, @RequestParam String offobjectNo){
+//        String offobjectNo =data.getOffobjectNo();
+        sendData(response,infoService.getoffobjectStageId(offobjectNo));
+    }
+
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mybatis/InfoMapper.xml

@@ -10,7 +10,7 @@
         RISKEXPOSURE_SUPER    as parentid,
         RISKEXPOSURE_STATE    as attributes
         from RWA_CALC_CONF_RISKEXPOSURE
-        order by RISKEXPOSURE_SUPER,RISKEXPOSURE_NO
+        order by nvl(RISKEXPOSURE_SUPER,0),RISKEXPOSURE_NO
     </select>
 
     <!-- 定义维护页面展示 -->

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/service/InfoService.java

@@ -3,6 +3,7 @@ package com.sundata.product.rwa.rwacalcconfig001riskexposure.service;
 
 import com.sundata.admin.nounmanage.model.DictContent;
 import com.sundata.admin.nounmanage.model.DictTree;
+import com.sundata.common.util.DBExecutor;
 import com.sundata.common.util.TreeUtil;
 
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.mapper.InfoMapper;
@@ -139,4 +140,17 @@ public  class InfoService implements CommandLineRunner {
     public void delRiskData(String[] code) {
         infoMapper.delRiskData(code);
     }
+
+    public String getoffobjectStageId(String offobjectNo){
+        String res =  DBExecutor.doQuery("   select  coalesce(T4.RISKEXPOSURE_STAGE_ID,t3.RISKEXPOSURE_STAGE_ID,t2.RISKEXPOSURE_STAGE_ID,t1.RISKEXPOSURE_STAGE_ID) as res\n" +
+                "                  from  RWA_CALC_CONF_RISKEXPOSURE T1\n" +
+                "                  left join RWA_CALC_CONF_RISKEXPOSURE T2\n" +
+                "                  on t1.RISKEXPOSURE_SUPER = t2.RISKEXPOSURE_NO\n" +
+                "                 left join RWA_CALC_CONF_RISKEXPOSURE t3\n" +
+                "                  on t2.RISKEXPOSURE_SUPER = t3.RISKEXPOSURE_NO\n" +
+                "                  left join RWA_CALC_CONF_RISKEXPOSURE t4\n" +
+                "                  on t3.RISKEXPOSURE_SUPER = t4.RISKEXPOSURE_NO\n" +
+                "                  where t1.RISKEXPOSURE_NO = '"+offobjectNo+"'");
+        return  res;
+    }
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig003regularrrcsrule/mybatis/ReleaseToolMapper.xml

@@ -309,5 +309,10 @@
         </where>
     </select>
 
+    <select id="zhuangtai" resultType="com.sundata.admin.nounmanage.model.DictContent">
+        select  t1.zt as id ,case when t1.zt = '1' then '生效' else '失效' end as text
+        from (select '1' as zt from dual union all select '0' as zt from dual ) t1
+    </select>
+
 
 </mapper>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig004rwa/action/MeteringParamDefineAction.java

@@ -89,7 +89,9 @@ public class MeteringParamDefineAction extends BaseAction {
     public void isNotExist(HttpServletRequest request, HttpServletResponse response, @RequestBody MeteringParamDefineModel model) {
         if (null != model && null != model.getParamName() && !model.getParamName().isEmpty()){
             MeteringParamDefineModel checkModel = meteringParamDefineService.selectParamName(model);
-            if (null != checkModel) {
+            Integer mun = Integer.valueOf((String) checkModel.getParamName());
+            //Integer checkModel = meteringParamDefineService.selectParamName(model);
+            if (mun>=2 ) {
                 sendData(response,"该名已存在");
             } else {
                 sendData(response,true);

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig004rwa/model/ProductListModel.java

@@ -12,6 +12,16 @@ public class ProductListModel {
     //来源系统
     private String productFromSystem;
 
+    private String productStageId;
+
+    public String getProductStageId() {
+        return productStageId;
+    }
+
+    public void setProductStageId(String productStageId) {
+        this.productStageId = productStageId;
+    }
+
     public String getProductNo() {
         return productNo;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig004rwa/mybatis/CreditRiskMeteringRuleMapper.xml

@@ -282,20 +282,35 @@
 
     <!-- 产品列表数据展示数据 -->
     <select id="getProductDataList" resultType="com.sundata.product.rwa.rwacalcconfig004rwa.model.ProductListModel">
+       <![CDATA[
         SELECT
         T2.PRODUCT_NO                        AS      productNo,
         T2.PRODUCT_NAME                      AS      productName,
         T2.PRODUCT_TYPE                      AS      productType,
         T2.PRODUCT_BUSSINESS_CODE            AS      productBussinessCode,
-        REPLACE(T2.PRODUCT_FROM_SYSTEM,CHR(32),'' )              AS      productFromSystem
+        t3.VALUER            AS      productFromSystem,
+        t2.PRODUCT_STAGE_ID      AS   productStageId
         FROM RWA_CALC_CONF_CREDITRISK T1
         INNER JOIN RWA_CALC_CONF_PRODUCT T2
         ON T2.PRODUCT_BUSSINESS_CODE = T1.CREDITRISK_BUSSINESS_CODE
+        left join (
+        SELECT T1.PRODUCT_NO,GROUP_CONCAT(T2.NOUNNAME SEPARATOR ',') AS VALUER  FROM
+        (SELECT TRIM(REGEXP_SUBSTR(T1.STR, '[^,]+', 1, N.N)) AS ID,PRODUCT_NO
+        FROM (SELECT  PRODUCT_FROM_SYSTEM AS STR,PRODUCT_NO AS PRODUCT_NO FROM RWA_CALC_CONF_PRODUCT ) T1
+        JOIN (SELECT LEVEL  AS N FROM DUAL CONNECT BY LEVEL < 100 ) N ON LENGTH(T1.STR) - LENGTH(REPLACE(T1.STR,',',''))>=N.N-1 ) T1
+        LEFT JOIN SYS_NOUN T2
+        ON T2.NOUNVALUE = T1.ID
+        AND T2.NOUNITEM ='PRODUCTFROMSYSTEM'
+        GROUP BY T1.PRODUCT_NO) t3
+        on t2.PRODUCT_NO = t3.PRODUCT_NO
+         ]]>
+
         <where>
             <if test="creditRiskNo != null and creditRiskNo !=''">
                 T1.CREDITRISK_NO = #{creditRiskNo}
             </if>
         </where>
+
     </select>
 
     <!-- 输入源数据展示 -->
@@ -334,6 +349,13 @@
         </where>
     </select>
 
+    <select id="getTab" resultType="com.sundata.admin.nounmanage.model.DictContent">
+        select dataclasscode AS id ,tabname AS text from SYS_SQLEDIT_DEF_DATACLASS order by dataclasscode asc
+    </select>
+
+    <select id="PRODUCTFROMSYSTEM1" resultType="com.sundata.admin.nounmanage.model.DictContent">
+        select NOUNVALUE AS id ,NOUNNAME AS text from sys_noun where nounitem = 'PRODUCTFROMSYSTEM'  AND nounlevel  = '3'
+    </select>
 
 
 </mapper>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig004rwa/mybatis/MeteringParamDefineMapper.xml

@@ -98,6 +98,7 @@
 
     <!-- 计量参数定义校验用 -->
     <select id="selectParamName" resultType="com.sundata.product.rwa.rwacalcconfig004rwa.model.MeteringParamDefineModel">
+        select count(1) as paramName from (
         SELECT
         CALCINDEX                     AS     calcIndex,
         SDATE                         AS     startDate,
@@ -115,6 +116,7 @@
                 PARAM_NAME = #{model.paramName}
             </if>
         </where>
+        )
     </select>
 
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig004rwa/service/MeteringParamDefineService.java

@@ -73,5 +73,6 @@ public class MeteringParamDefineService {
      */
     public MeteringParamDefineModel selectParamName(MeteringParamDefineModel model) {
         return meteringParamDefineMapper.selectParamName(model);
+
     }
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigacquisition/action/RuleAction.java

@@ -40,7 +40,7 @@ public class RuleAction extends BaseAction {
         sendData(response, ruleService.createDetailData(model));
     }
 
-    @RequestMapping("/deleteRows")
+    @RequestMapping("/updateDataState")
     public void updateDataState (HttpServletRequest request,
                             HttpServletResponse response, @RequestParam String ruleNo) {
         // 作废当前行

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigacquisition/mybatis/RuleMapper.xml

@@ -112,12 +112,12 @@
         update RWA_CALC_CONF_LEDGERCONFIG
         <trim suffixOverrides=",">
             <set>
-                <if test="model.ruleNo != null and '' != model.ruleNo">
-                    RULE_NO=#{model.ruleNo},
-                </if>
-                <if test="model.ruleNo != null and '' != model.ruleNo">
-                    RULE_NO=#{model.ruleNo},
-                </if>
+<!--                <if test="model.ruleNo != null and '' != model.ruleNo">-->
+<!--                    RULE_NO=#{model.ruleNo},-->
+<!--                </if>-->
+<!--                <if test="model.ruleNo != null and '' != model.ruleNo">-->
+<!--                    RULE_NO=#{model.ruleNo},-->
+<!--                </if>-->
                 <if test="model.ruleName != null and '' != model.ruleName">
                     RULE_NAME=#{model.ruleName},
                 </if>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/BusinessMapper.xml

@@ -122,7 +122,7 @@
         PRODUCT_BUSSINESS_CODE as productBussinessCode,
         PRODUCT_STAGE_ID as productStageId,
         PRODUCT_INDEX as productIndex,
-        PRODUCT_FROM_SYSTEM as productFromSystem,
+        REPLACE(PRODUCT_FROM_SYSTEM,' ','') as productFromSystems,
         DEFAULT_GETDATARULE as defaultGetdatarule,
         DEFAULT_OUT as defaultOut
         from RWA_CALC_CONF_PRODUCT

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/ProductListMapper.xml

@@ -4,6 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundata.product.rwa.rwacalcconfigdataparam.mapper.ProductListMapper">
     <select id="productlist" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
+        <![CDATA[
         select
              T1.CALCINDEX as calcindex,
              T1.SDATE as sdate,
@@ -26,7 +27,7 @@
         SELECT T1.PRODUCT_NO,GROUP_CONCAT(T2.NOUNNAME SEPARATOR ',') AS VALUER  FROM
         (SELECT TRIM(REGEXP_SUBSTR(T1.STR, '[^,]+', 1, N.N)) AS ID,PRODUCT_NO
         FROM (SELECT  PRODUCT_FROM_SYSTEM AS STR,PRODUCT_NO AS PRODUCT_NO FROM RWA_CALC_CONF_PRODUCT ) T1
-        JOIN (SELECT 1  AS N FROM DUAL UNION ALL SELECT 2 FROM DUAL ) N ON LENGTH(T1.STR) - LENGTH(REPLACE(T1.STR,',',''))>=N.N-1 ) T1
+        JOIN (SELECT LEVEL  AS N FROM DUAL CONNECT BY LEVEL < 100 ) N ON LENGTH(T1.STR) - LENGTH(REPLACE(T1.STR,',',''))>=N.N-1 ) T1
         LEFT JOIN SYS_NOUN T2
         ON T2.NOUNVALUE = T1.ID
         AND T2.NOUNITEM ='PRODUCTFROMSYSTEM'
@@ -36,6 +37,8 @@
         ON T1.PRODUCT_TYPE = T3.NOUNVALUE
         AND T3.NOUNITEM = 'PRODUCT_TYPE'
         where 1=1
+         ]]>
+
         <if test="productNo !='' and productNo!=null">
             and T1.PRODUCT_NO like concat('%',#{productNo},'%')
         </if>

Procedure/frontend/projectb/src/pages/product/dataquality/dataqualityruledefine.tsx

@@ -73,7 +73,7 @@ const dataqualityruledefine : React.FC<widowRush> = (prop:widowRush) => {
        baseFun.info("保存成功")
     } else if (editType == 'create' ) {
       const sd = await isNotExist(data.checkRuleNo);
-      if(Number(sd)>1){
+      if(Number(sd)<1){
       await createRowData(data);
       closeAndRefresh();
       setDetailVisible(false);
@@ -250,8 +250,8 @@ const dataqualityruledefine : React.FC<widowRush> = (prop:widowRush) => {
           formRef={formRef1}
         >
             <SDAreaTtile title='规则信息'/>
-            <SDFormText name="checkRuleNo" readonlyCond="update" required={true} label="规则编号" rules={[{max:60,message:'最多50个字符'}]}/>
-            <SDFormText name="checkRuleName" label="规则名称" rules={[{validator:(rules,value,callback)=>{
+            <SDFormText name="checkRuleNo" readonlyCond="update" required={true} label="规则编号" rules={[{max:60,message:'最多50个字符'}]} />
+            <SDFormText name="checkRuleName" label="规则名称" required={true} rules={[{validator:(rules,value,callback)=>{
             let chineseCount = countChineseChars(value);
             if (chineseCount > 30) {
                 callback('最多30个汉字');
@@ -261,12 +261,12 @@ const dataqualityruledefine : React.FC<widowRush> = (prop:widowRush) => {
               callback();
             }
          }}]}/>
-            <SDFormDict name="checkRate"  label="检查频率" dictKey="CHECK_RATE" />
-            <SDFormText name="adjustDate" label="天数调整"/>
-            <SDFormDict name="checkRuleType" label="校验类型" dictKey="CHECK_RULE_TYPE"/>
-            <SDFormDict name="checkTableName" label="被检查表"  dictKey="@checkTableName" multiple={true}/>
-            <SDFormDict name="ruleStageId" label="所属阶段" dictKey="@ruleStageId"/>
-            <SDFormText type="textarea" name="checkProposal" label="处理方案建议"  rules={[{validator:(rules,value,callback)=>{
+            <SDFormDict name="checkRate"  label="检查频率" dictKey="CHECK_RATE" required={true}/>
+            <SDFormText name="adjustDate" label="天数调整" required={true} />
+            <SDFormDict name="checkRuleType" label="校验类型" dictKey="CHECK_RULE_TYPE" required={true}/>
+            <SDFormDict name="checkTableName" label="被检查表"  dictKey="@checkTableName" multiple={true} required={true}/>
+            <SDFormDict name="ruleStageId" label="所属阶段" dictKey="@ruleStageId" required={true}/>
+            <SDFormText type="textarea" name="checkProposal" label="处理方案建议" required={true} rules={[{validator:(rules,value,callback)=>{
             let chineseCount = countChineseChars(value);
             if (chineseCount > 200) {
                 callback('最多200个汉字');
@@ -276,7 +276,7 @@ const dataqualityruledefine : React.FC<widowRush> = (prop:widowRush) => {
               callback();
             }
          }}]}/>
-            <SDFormText type="textarea" name="checkRuleDesc"  label="检查规则说明"  rules={[{validator:(rules,value,callback)=>{
+            <SDFormText type="textarea" name="checkRuleDesc"  label="检查规则说明" required={true} rules={[{validator:(rules,value,callback)=>{
             let chineseCount = countChineseChars(value);
             if (chineseCount > 200) {
                 callback('最多200个汉字');
@@ -286,7 +286,7 @@ const dataqualityruledefine : React.FC<widowRush> = (prop:widowRush) => {
               callback();
             }
          }}]}/>
-            <SDFormText type="textarea" name="checkRule"  label="检查规则sql"/>
+            <SDFormText type="textarea" name="checkRule"  label="检查规则sql" required={true}/>
         
             
         </SDModalForm>

Procedure/frontend/projectb/src/pages/product/dataquality/datascopemanage.tsx

@@ -73,6 +73,8 @@ const datascopemanage : React.FC<widowRush> = (prop:widowRush) => {
       formRef.current?.setFieldsValue(data1);
       const fieldData = await getFieldDataList(formdata);
       setFieldRelationData(fieldData);
+      setEnglishSourceTableName(data1.englishSourceTableNames.replace(/\s+/g, ''));
+      setEnglishTargetTableName(data1.englishTargetTableNames.replace(/\s+/g, ''));
      }
     // 删除
     const delRows =async(record:any)=>{ 
@@ -258,6 +260,8 @@ const datascopemanage : React.FC<widowRush> = (prop:widowRush) => {
                 setCurrentRow(record);
                 setDetailVisible(true);
                 setEditType('update');
+                select1();
+                select3();
                } }
             >
               修改
@@ -534,6 +538,7 @@ const datascopemanage : React.FC<widowRush> = (prop:widowRush) => {
                     setFieldRelationData(fieldRelationData.filter((item)=>{
                       return item.fieldRelationNo !== selectRowData.fieldRelationNo}));
                     fillInActionRef.current?.reload();
+                    fillInActionRef.current?.reset?.();
                   }
                 }}
               >

Procedure/frontend/projectb/src/pages/product/datasupplementary/supplementtaskmanagement.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import { type ProColumns, type ActionType, type ProFormInstance, ProTable, EditableProTable } from '@ant-design/pro-components';
-import type {FormInstance} from 'antd'
+import {FormInstance, Select} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDSubmitButton,EditType, SDAreaTtile, SDOperate, baseFun,SDModal, validateFun, SDLayout, SDFormDict, } from "@sundata/ui-frame";
 import type { SupplementTaskDefineModel,SupplementTemplateRelationModel,TemplateDataValidationRuleModel, } from '@/services/rwa/product/datasupplementary/supplementtaskmanagement';
@@ -45,6 +45,8 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
     const [dictionArray1,setDictionArray1] = useState<any[]>();
     const [dictionArray2,setDictionArray2] = useState<any[]>();
 
+    const [current,setCurrent] = useState<any>();
+
     // 字典
     const { fetchDict } = useModel('dict');
     const [account,setAccount] = useState <any>();
@@ -52,14 +54,19 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
     /** 字段关系序号编辑 */
     var dataInfoIndex = 0;
 
+    var paramIndex = 0;
+
     useEffect(() => {
-      selectDict().then((data)=>{
+            selectDict().then((data)=>{
         setDictionArray1(data);
       });
       selectDictDefine().then((data)=>{
         setDictionArray2(data);
       });
       }, []);
+
+
+
     
     // 修改查询查询
     const selectData = async (formdata : SupplementTaskDefineModel) => {
@@ -178,7 +185,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
           valueType:"treeSelect",
           request:()=>fetchDict("org"),
           fieldProps:{ 
-            reeDefaultExpandAll:true,
+            treeDefaultExpandAll:true,
             treeCheckable:true, 
            popupMatchSelectWidth:300 
           },
@@ -200,6 +207,12 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
           hideInTable: false,
           search: false,
         },
+        {
+          title: '首选负责人', 
+          dataIndex: 'account1',
+          hideInTable: true,
+        //  search: false,
+        },
         {
           title: '补录频率', 
           dataIndex: 'frequencys',
@@ -288,7 +301,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
               ()=>{ 
               selectData(record);
               setDetailVisible(true);
-              setEditType('update');
+              setEditType('display');
              } }
           >
             查看
@@ -304,7 +317,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
           title: '序号',
           dataIndex: 'id',
           search: false,
-          render: (text, record, index) => { index  = index + 1; return index},
+          render: (text, record, index) => { (index = index + 1);paramIndex = index ; return index},
           width:100,
           ellipsis:true,
           editable:false
@@ -344,15 +357,19 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
               rules:[
                 {required:true},
                 {validator:(rules,value,callback)=>{
-                  if (templateListData?.find(item => value === item?.tmpCodeOfDefine)) {
+                  if(current !=value ){
+                  if ((templateListData?.filter( item => value === item?.tmpCodeOfDefine)).length >0 ) {
                     callback('补录模板列表不可出现重复模板');
                   } else if (value === '请选择补录模板'){
                     callback('请选择补录模板');
                   } else {
                     callback();
                   }
-                }},
+                }else{
+                  callback();
+                }}},
               ]
+              
             },
             fieldProps: {
               options: dictionArray2,
@@ -392,16 +409,19 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             dataIndex: 'operate',
             valueType: 'option',
             render: (_, record) => [
+              <span style={editType == 'display' ? {display:'none'}: {}}>
               <SDOperate
                 key="roleCfg"
                 icon={<WomanOutlined />}
                 successMessage=""
                 onClick={async ()=>{
                   templateListActionRef.current?.startEditable(record.tmpCodeOfDefine);
+                  setCurrent(record.tmpCodeOfDefine)
                  } }
               >
                 编辑
               </SDOperate>,
+              </span>
             ],
           },
         ];
@@ -477,6 +497,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                     callback();
                   }
                }},]
+               
             }
           },
           {
@@ -488,10 +509,21 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             valueType:'treeSelect',
             formItemProps:{
               rules:[
-                {required:true},]
+                {required:true},
+              ],
             },
             fieldProps: {
               options: dictionArray1,
+            },
+            renderFormItem:(item, { value, onChange })=>{
+              return(
+                <Select
+                value = {value}
+                options={
+                  dictionArray1
+                }
+                ></Select>
+              );
             }
           },
           {
@@ -621,13 +653,16 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             width:150,
           ellipsis:true
           },
+          
           {
+            
             title: '操作',
             dataIndex: 'operate',
             valueType: 'option',
             width:150,
           ellipsis:true,
             render: (_, record) => [
+              <span style={editType == 'display' ? {display:'none'}: {}}>
               <SDOperate
                 key="roleCfg"
                 icon={<WomanOutlined />}
@@ -639,6 +674,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
               >
                 编辑
               </SDOperate>,
+              </span>
             ],
           },
         ];
@@ -665,6 +701,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                 setDetailVisible(true);
                 setTemplateListData([]);
                 setTemplateCheckData([]);
+                setDictionArray1([])
             }}
           >
             新增
@@ -724,7 +761,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             <SDFormDict dictKey="@account1" name="account"     label="首选责任人" dictParam={`{"account":"${account}"}`}/>
             <SDFormDict dictKey="FREQUENCY" name="frequency"  label="补录频率"/>
             <SDFormText name="adjustment"  label="天数调整"/>
-            <SDFormDict dictKey="@tmpFileCode" name="tmpFileCode"  label="所属阶段" />
+            <SDFormDict dictKey="@tmpFileCode" name="stageinId"  label="所属阶段" />
         <SDLayout>
         <SDAreaTtile title='补录模板列表'/>
         <EditableProTable
@@ -734,7 +771,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
               actionRef={templateListActionRef}
               value={templateListData}
               editable={{
-                actionRender: (row,config,defaultDoms)=>{
+                actionRender: (_row,_config,defaultDoms)=>{
                   return [defaultDoms.save,defaultDoms.delete,defaultDoms.cancel]
                 },
               }}
@@ -746,6 +783,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                     templateListActionRef.current?.addEditRecord?.({
                       tmpCodeOfDefine: '请选择补录模板',
                       title: 'NEWROW',
+                      id: paramIndex+1,
                     });
                   }}
                 >
@@ -770,6 +808,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                      dictionArray1?.push(obj);
                    }
                 })
+                
               }}
            />
         </SDLayout>
@@ -818,7 +857,10 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                       tmpverificationCode: nextId,
                       title: 'NEWROW',
                     });
-                  }}
+                  }
+                  
+                }
+                
                 >
                   新增
                 </SDButton>,

Procedure/frontend/projectb/src/pages/product/report_form_config_reportcreater/reportfillingconfig.tsx

@@ -345,8 +345,8 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       hideInTable: false,
       width:150,
       ellipsis:true,
-      valueType: 'treeSelect',
-      request: () => fetchDict('CELL_STYLE_TYPE'),
+      valueType: 'select',
+      request: () => fetchDict('UNIT_STYLE_TYPE'),
       fieldProps: {
         treeDefaultExpandAll: true,
       },
@@ -358,8 +358,8 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       hideInTable: false,
       width:150,
       ellipsis:true,
-      valueType: 'treeSelect',
-      request: () => fetchDict('CELL_DATA_TYPE'),
+      valueType: 'select',
+      request: () => fetchDict('UNIT_DATA_TYPE'),
       fieldProps: {
         treeDefaultExpandAll: true,
       },
@@ -371,8 +371,8 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       hideInTable: false,
       width:150,
       ellipsis:true,
-      valueType: 'treeSelect',
-      // request: () => fetchDict('CALC_PROCESS_TYPE'),
+      valueType: 'select',
+       request: () => fetchDict('PARAM_CALC_TYPE'),
       fieldProps: {
         options: dictionArray,
         treeDefaultExpandAll: true,
@@ -500,7 +500,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       search: false,
       hideInTable: false,
       valueType: 'treeSelect',
-      request: () => fetchDict('YESORNO'),
+      request: () => fetchDict('UNIT_STYLE_TYPE'),
       fieldProps: {
         treeDefaultExpandAll: true,
       },
@@ -613,14 +613,16 @@ const analyseFile = async (data: ReportDefinitionModel) => {
             params={currentRow}
             visible={detailVisible}
             onVisibleChange={() => { setDetailVisible(false); } }
-            initialValues={{
-              reportNo: busiPk
-            }}
-            onValuesChange={async (changeValues) => {
+            // initialValues={{
+            //   reportNo: busiPk
+            // }}
+            onValuesChange={async (changeValues,values) => {
               if (changeValues.reportNo == '') {
                 setBusiPk('');
                 setFillInFormData([]);
                 setCalculateFormData([]);
+              }else{
+                setBusiPk(values.reportNo);
               }
 
               // 报表类型值变化与计算过程下拉列表联动

Procedure/frontend/projectb/src/pages/product/rwa_calc_config_004rwa/creditriskmeteringrule.tsx

@@ -61,6 +61,8 @@ const creditriskmeteringrule : React.FC<widowProps> = (prop:widowProps) => {
 
     const [creditRiskBussinessCode,setCreditRiskBussinessCode] = useState<any>();
 
+    const [defaultOut,setDefaultOut] = useState<any>();
+
     useEffect(() => {
       }, []);
     
@@ -181,6 +183,7 @@ const creditriskmeteringrule : React.FC<widowProps> = (prop:widowProps) => {
         {
           title: '序号',
           dataIndex: 'index',
+          search:false,
           render: (text, record, index) => {(index = index + 1); return index},
         },
         {
@@ -445,7 +448,7 @@ const creditriskmeteringrule : React.FC<widowProps> = (prop:widowProps) => {
             width:150,
             ellipsis:true,
             valueType: 'treeSelect',
-            request: () => fetchDict('org'),
+            request: () => fetchDict({dictKey :'@getTab'}),
             fieldProps: {
               treeDefaultExpandAll: true,
               treeCheckable:true,
@@ -458,7 +461,7 @@ const creditriskmeteringrule : React.FC<widowProps> = (prop:widowProps) => {
             width:150,
             ellipsis:true,
             valueType: 'treeSelect',
-            request: () => fetchDict('org'),
+            request: () => fetchDict({dictKey :'@getTab'}),
             fieldProps: {
               treeDefaultExpandAll: true,
               treeCheckable:true,
@@ -523,12 +526,18 @@ const productColumns: ProColumns<productListModel>[] = [
     },
     { title : '来源系统',
     dataIndex : 'productFromSystem',
-    //valueType:"select",
-    //request:()=>fetchDict( {dictKey :"@productFromSystems"}),
+    valueType:"select",
+    request:()=>fetchDict( {dictKey :'@PRODUCTFROMSYSTEM1'}),
     search:false,
     hideInTable:false,
     width : 150
     },
+    { title : '所属阶段',
+    dataIndex : 'productStageId',
+    search:false,
+    hideInTable:true,
+    width : 150
+    },
     {
         title: '操作',
         dataIndex: 'operate',
@@ -542,6 +551,7 @@ const productColumns: ProColumns<productListModel>[] = [
         setProductEditType('display');
         selectProductInfo(record);
         setTransferVisible(true);
+        setDefaultOut(record.productStageId)
          } }
       >
         查看
@@ -646,6 +656,8 @@ const columns1: ProColumns<rwaCalcConfProductrulesModel>[] = [
   
   { title : '输出数据源',
   dataIndex : 'ruleOut',
+  valueType:'select',
+  request:()=>fetchDict({ dictKey :'@getTab'}),
   width : 150
   },
   
@@ -748,7 +760,7 @@ return (
             }
          }}]} label="规则名称"/>
         <SDFormDict required={true} name="creditRiskBussinessCode" label="所属业务" dictKey ='@BUSSINESS_CODE' />
-        <SDFormDict  required={true} name="defaultOut" label="默认输出数据源" dictKey='org'  />
+        <SDFormDict  required={true} name="defaultOut" label="默认输出数据源" dictKey='@getTab'  />
         <SDFormText name="creditRiskIndex" required={true} label="规则序号"/>
         <SDFormText name="defaultRule" required={true} type="textarea"  label="默认规则"/>
          <SDLayout>
@@ -819,8 +831,8 @@ return (
               callback();
             }
          }}]} label="步骤类型"/>
-        <SDFormDict dictKey='org' multiple={true} name="stepIns"  label="输入数据源" />
-        <SDFormDict dictKey='org' multiple={true}  name="stepOuts"  label="输出数据源"/>
+        <SDFormDict dictKey='@getTab' multiple={true} name="stepIns"  label="输入数据源" />
+        <SDFormDict dictKey='@getTab' multiple={true}  name="stepOuts"  label="输出数据源"/>
         <SDFormText  name="stepIndex" label="步骤序号" />
         <SDFormText type="textarea" name="stepRule" label="步骤规则"/>
         
@@ -904,12 +916,12 @@ return (
    </span>
    <SDFormText name="productNo"   label="产品代码"  />
    <SDFormText name="productName"   label="产品名称"  />
-   <SDFormText name="productType"   label="产品大类"  />
+   <SDFormDict name="productType"   label="产品大类"  dictKey="PRODUCT_TYPE"/>
    <SDFormText name="productIndex"   label="产品序号"  />
-   <SDFormText name="productStageId"   label="所属阶段"  />
-   <SDFormText name="productFromSystem"   label="来源系统"  />
-   <SDFormText name="defaultOut"   label="默认输出数据源"  />
-   <SDFormText name="productBussinessCode"   label="所属业务"  />
+   <SDFormDict name="productStageId"   label="所属阶段" dictKey = '@productStageId' />
+   <SDFormDict name="productFromSystem"   label="来源系统" dictKey = 'PRODUCTFROMSYSTEM' />
+   <SDFormDict name="defaultOut"   label="默认输出数据源" dictKey ='@selectdefaultOut'   dictParam={`{"defaultOut":"${defaultOut}"}`}  />
+   <SDFormDict name="productBussinessCode"   label="所属业务"  />
    <SDFormText name="defaultGetdatarule"   label="默认取数逻辑"  />
      <SDAreaTtile title='科目取数规则列表' />
      <SDLayout>

Procedure/frontend/projectb/src/pages/project/dataquality/BondInvestment.tsx

@@ -382,6 +382,7 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
           title: '经营机构名称',
           dataIndex: 'manageOrgnName',
           hideInTable: false,
+          search:false,
           width:150,
           ellipsis:true,
         },

Procedure/frontend/projectb/src/pages/project/dataquality/CollateralTable.tsx

@@ -3,8 +3,7 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDForm,SDSubmitButton,EditType, SDAreaTtile, SDLayout, SDOperate, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel} from '@/services/rwa/dataquality/CollateralTable';
+import {getDataList,selectDetailData,exportExcelModel, SysListModel} from '@/services/rwa/dataquality/CollateralTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -211,6 +210,20 @@ const CollateralTable : React.FC<widowRush> = (prop:widowRush) => {
           width:150,
           ellipsis:true
         },
+        {
+          title: '缓释品类型',
+          dataIndex: 'mitigationProdTypeCode',
+          valueType:'treeSelect',
+          request:()=>fetchDict('interIndustry'),
+          fieldProps: {
+            treeDefaultExpandAll: true,
+            treeCheckable:true,
+            popupMatchSelectWidth:300,
+           },
+          hideInTable: true,
+          width:150,
+          ellipsis:true
+        },
         {
           title: '发行（承兑）人名称',
           dataIndex: 'issuerName',

Procedure/frontend/projectb/src/pages/project/dataquality/CustomerTable.tsx

@@ -3,8 +3,8 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import {Flex, type FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDTable,EditType,DictTree,SDFormItem,SDButton, baseFun,SDModalForm,SDOperate,SDSubmitButton } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel} from '@/services/rwa/dataquality/CustomerTable';
+
+import {getDataList,selectDetailData,exportExcelModel, SysListModel} from '@/services/rwa/dataquality/CustomerTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -66,6 +66,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '起始数据日期',
           dataIndex: 'startDate',
+          valueType:'date',
           search: false,
           hideInTable: true,
           width:150,
@@ -160,7 +161,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
         },
         {
           title: '交易对手证件号码',
-          dataIndex: 'customerLicenceNo',
+          dataIndex: 'tradeCntrptyDocumentNo',
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -184,7 +185,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
         },
         {
           title: '企业规模',
-          dataIndex: 'entScaleCode',
+          dataIndex: 'entScaleCodes',
           hideInTable: true,
           width:150,
           ellipsis:true,
@@ -208,20 +209,22 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
           title: '行业名称',
           dataIndex: 'industryName',
           hideInTable: false,
+          search:false,
           width:150,
           ellipsis:true,
         },
         {
           title: '所属行业',
-          dataIndex: 'industryCode',
+          dataIndex: 'industryCodes',
           hideInTable: true,
           width:200,
           ellipsis:true,
           valueType: 'treeSelect',
-          request: () => fetchDict(''),
+          request: () => fetchDict('interIndustry'),
           fieldProps: {
            treeDefaultExpandAll: true,
            treeCheckable:true,
+           popupMatchSelectWidth:300,
           },
           order:-7,
         },

Procedure/frontend/projectb/src/pages/project/dataquality/DiscountTable.tsx

@@ -3,8 +3,8 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDButton,EditType, SDOperate, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel} from '@/services/rwa/dataquality/DiscountTable';
+
+import {getDataList,selectDetailData,exportExcelModel, SysListModel} from '@/services/rwa/dataquality/DiscountTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -230,6 +230,20 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           width:150,
           ellipsis:true
         },
+        {
+          title: '贴现类型',
+          dataIndex: 'discountingTypes',
+          valueType:'treeSelect',
+          request:()=>fetchDict('discountingType'),
+          fieldProps: {
+            treeDefaultExpandAll: true,
+            treeCheckable:true,
+         },
+          hideInTable: true,
+          width:150,
+          ellipsis:true,
+          order:-6
+        },
         {
           title: '贴现类型',
           dataIndex: 'discountingTypeDesc',
@@ -237,7 +251,6 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           hideInTable: false,
           width:150,
           ellipsis:true,
-          order:-6
         },
         {
           title: '票据类型代码',
@@ -255,24 +268,27 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
         },
+        width:150,
         },
         {
           title: '票号',
           dataIndex: 'billNo',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '产品编号',
           dataIndex: 'productNo',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '产品名称',
           dataIndex: 'productName',
-          search: false,
           hideInTable: false,
+          width:150,
           order:-8
         },
         {
@@ -280,6 +296,7 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           dataIndex: 'onbalshOffbalshFlag',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '表内外标识',
@@ -291,12 +308,14 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
         },
+        width:150,
         },
         {
           title: '账簿类型代码',
           dataIndex: 'accountBookType',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '账簿类型',
@@ -308,12 +327,14 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
         },
+        width:150,
         },
         {
           title: '是否我行承兑代码',
           dataIndex: 'ifSelfbankAcceptance',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '是否我行承兑',
@@ -325,24 +346,28 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
         },
+        width:150,
         },
         {
           title: '承兑人客户编号',
           dataIndex: 'acceptorClientNo',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '承兑人客户名',
           dataIndex: 'acceptorClientName',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '账务机构编号', 
           dataIndex: 'accountOrgnNo',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '账务机构名称', 
@@ -355,34 +380,48 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
           dataIndex: 'manageOrgnNo',
           search: false,
           hideInTable: false,
+          width:150,
+        },
+        {
+          title: '经营机构',
+          dataIndex: 'manageOrgnNos',
+          valueType:'treeSelect',
+          request:()=>fetchDict('org'),
+          fieldProps: {
+            treeDefaultExpandAll: true,
+            treeCheckable:true,
+            popupMatchSelectWidth:300
+         },
+          order:-7,
+          hideInTable: true,
         },
         {
           title: '经营机构编名称',
           dataIndex: 'manageOrgnName',
           search: false,
           hideInTable: false,
-          order:-7
+          width:150,
         },
         {
           title: '核心客户号',
           dataIndex: 'coreClientNo',
-          search: false,
           hideInTable: false,
+          width:150,
           order:-3
         },
         {
           title: '客户编号',
           dataIndex: 'clientNo',
-          search: false,
           hideInTable: false,
+          width:150,
           order:-4
         },
         {
           title: '客户名称',
           dataIndex: 'clientName',
-          search: false,
           hideInTable: false,
-          order:-5
+          order:-5,
+          width:150,
         },
       ];
     

Procedure/frontend/projectb/src/pages/project/dataquality/GuaranteeTable.tsx

@@ -2,8 +2,8 @@ import React, { useEffect, useRef, useState } from "react";
 import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-components';
 import type {FormInstance} from 'antd'
 import { SDPage,SDTable,SDButton,EditType, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel,} from '@/services/rwa/dataquality/GuaranteeTable';
+
+import {getDataList,selectDetailData,exportExcelModel, SysListModel,} from '@/services/rwa/dataquality/GuaranteeTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -110,6 +110,7 @@ const GuaranteeTable : React.FC<widowRush> = (prop:widowRush) => {
           title: '缓释品类型代码', 
           dataIndex: 'mitigationProdType',
           hideInTable: false,
+          search:false,
           width:150,
           ellipsis:true,
           order:-3
@@ -125,6 +126,7 @@ const GuaranteeTable : React.FC<widowRush> = (prop:widowRush) => {
           request: () => fetchDict('SLOW_RELEASE_TYPE'),
           fieldProps: {
            treeDefaultExpandAll: true,
+           treeCheckable:true,
         },
         },
         {

Procedure/frontend/projectb/src/pages/project/dataquality/InterbankDepositOrLendingTable.tsx

@@ -3,8 +3,8 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDTable,SDButton,EditType, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,exportExcelModel} from '@/services/rwa/dataquality/InterbankDepositOrLendingTable';
+
+import {getDataList,exportExcelModel, SysListModel} from '@/services/rwa/dataquality/InterbankDepositOrLendingTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -84,7 +84,6 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
         {
           title: '债项编号',
           dataIndex: 'debtitemNo',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -329,15 +328,16 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
         },
         {
           title: '经营机构编号',
-          dataIndex: 'mgmtBranchNo',
+          dataIndex: 'manageOrgnNo',
           hideInTable: false,
+          search:false,
           width:150,
           ellipsis:true,
           order:-5
         },
         {
           title: '经营机构编号',
-          dataIndex: 'mgmtBranchNos',
+          dataIndex: 'manageOrgnNos',
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -351,13 +351,13 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
         },
         {
           title: '经营机构编名称',
-          dataIndex: 'mgmtBranchName',
+          dataIndex: 'manageOrgnName',
           search: false,
           hideInTable: false,
         },
         {
           title: '客户编号',
-          dataIndex: 'customerNo',
+          dataIndex: 'clientNo',
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -365,7 +365,7 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
         },
         {
           title: '客户名称',
-          dataIndex: 'customerName',
+          dataIndex: 'clientName',
           hideInTable: false,
           width:150,
           ellipsis:true,

Procedure/frontend/projectb/src/pages/project/dataquality/OffCreditCard.tsx

@@ -3,8 +3,7 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDForm,SDSubmitButton,EditType, SDAreaTtile, SDLayout, SDOperate, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel} from '@/services/rwa/dataquality/OffCreditCard';
+import {getDataList,selectDetailData,exportExcelModel, SysListModel} from '@/services/rwa/dataquality/OffCreditCard';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -83,7 +82,6 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '核心客户号',
           dataIndex: 'coreClientNo',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -92,7 +90,6 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '客户编号',
           dataIndex: 'clientNo',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -102,7 +99,6 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '客户名称',
           dataIndex: 'clientName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -239,15 +235,14 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '产品编号',
           dataIndex: 'productNo',
-          search: false,
           hideInTable: false,
+          search: false,
           width:150,
           ellipsis:true
         },
         {
           title: '产品名称',
           dataIndex: 'productName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -329,24 +324,28 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
           dataIndex: 'accountOrgnNo',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '账务机构名称', 
           dataIndex: 'accountOrgnName',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '经营机构编号',
           dataIndex: 'manageOrgnNo',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '经营机构编名称',
           dataIndex: 'manageOrgnName',
           search: false,
           hideInTable: false,
+          width:150,
         },
         {
           title: '经营机构编',
@@ -371,12 +370,11 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '符合标准未使用额度标签',
           dataIndex: 'accordStandardUnuseLimitLabel',
-          search: false,
-          hideInTable: false,
+          hideInTable: true,
           width:150,
           ellipsis:true,
           valueType: 'treeSelect',
-          request: () => fetchDict(''),
+          request: () => fetchDict('TORF'),
           fieldProps: {
            treeDefaultExpandAll: true,
           },
@@ -393,12 +391,11 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '合格交易者标志',
           dataIndex: 'qualifiedTradersFlag',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
           valueType: 'treeSelect',
-          request: () => fetchDict(''),
+          request: () => fetchDict('TORF'),
           fieldProps: {
            treeDefaultExpandAll: true,
           },

Procedure/frontend/projectb/src/pages/project/dataquality/OnCreditCard.tsx

@@ -2,8 +2,8 @@ import React, { useEffect, useRef, useState } from "react";
 import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-components';
 import type {FormInstance} from 'antd'
 import { SDPage,SDTable,SDButton,EditType, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel} from '@/services/rwa/dataquality/OnCreditCard';
+
+import {getDataList,selectDetailData,exportExcelModel, SysListModel} from '@/services/rwa/dataquality/OnCreditCard';
 import { WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
@@ -43,8 +43,8 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '计算实例号',
           dataIndex: 'calcindex',
-          //search: true,
-          hideInTable: false,
+          search: false,
+          hideInTable: true,
           width:150,
           ellipsis:true
         },
@@ -76,6 +76,7 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
           title: '数据日期',
           dataIndex: 'dataDate',
           hideInTable: false,
+          valueType:'date',
           width:150,
           ellipsis:true,
           order:-1
@@ -301,7 +302,6 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '产品名称',
           dataIndex: 'productName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -354,7 +354,6 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '客户编号',
           dataIndex: 'clientNo',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -363,7 +362,6 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '客户名称',
           dataIndex: 'clientName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,

Procedure/frontend/projectb/src/pages/rwa_calc_config_001riskexposure/info.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { Button, Dropdown, Form, FormInstance, Input, Menu, Popover, Space, Tooltip, Upload } from 'antd';
 import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
 import { baseFun, ContextMenu, DictTree, EditType, SDOperate, SDForm, SDFormDict, SDFormText, SDLayout, SDModalForm, SDPage, SDSubmitButton, SDTable, SDTree, TableData,SDButton,SDAreaTtile } from '@sundata/ui-frame';
-import { SysFunButtonInfoModel,riskExposureDefinitionModel,riskExposureClassRuleModel } from '@/services/rwa/rwa_calc_config_001riskexposure/info';
+import { SysFunButtonInfoModel,riskExposureDefinitionModel,riskExposureClassRuleModel, getoffobjectStageId } from '@/services/rwa/rwa_calc_config_001riskexposure/info';
 import {  getDetail1, getFunTree1,getSelectTreeData,getRiskDataList,createRiskRuleData,updateRiskRuleExistData,delRiskRuleData,createRiskData,updateRiskData,isNotExist,deleteFunc } from '@/services/rwa/rwa_calc_config_001riskexposure/info';
 import { DataNode } from 'antd/lib/tree';
 import { MenuInfo } from 'rc-menu/lib/interface';
@@ -52,11 +52,15 @@ const info: React.FC<widowProp> = (prop:widowProp) => {
     // 页面数据
     const[formData,setFormData] = useState<riskExposureClassRuleModel[]>();
 
+    
+const [defaultOut,setDefaultOut]= useState<any>() ;
+const [offobjec,setOffobjec]=useState<boolean>(false);
+
     const { fetchDict } = useModel('dict');
 
   useEffect(() => {
     refreshTree();
-  }, []);
+  }, [setDefaultOut]);
 
   // 获取树结构
   const refreshTree = async () => {
@@ -172,7 +176,10 @@ const info: React.FC<widowProp> = (prop:widowProp) => {
     const handleSelect =async(record:any)=>{
       const selectKey = record[0];
       setKey(selectKey);
+      const getoffobjectStage = await getoffobjectStageId(selectKey); // 查询根节点的所属阶段
+      setDefaultOut(getoffobjectStage);
       const data = await getSelectTreeData(selectKey);
+      //setDefaultOut(data.riskExposureStageId);
       // 页面联动值初始化
       if (data.riskExposureIsmini == '1') {
         setRiskFlag(true);
@@ -185,6 +192,11 @@ const info: React.FC<widowProp> = (prop:widowProp) => {
       } else {
         setRiskWeightFlag(false);
       }
+      if(data.riskExposureSuper!='' && data.riskExposureSuper!=undefined){
+        setOffobjec(false);
+      }else{
+        setOffobjec(true);
+      }
       formRef.current?.setFieldsValue(data);
       setEditType('update');
     }
@@ -267,7 +279,7 @@ const info: React.FC<widowProp> = (prop:widowProp) => {
         search: false,
         hideInTable: false,
         valueType: 'treeSelect',
-          request: () => fetchDict('CUST_TYPE_LV02'),
+          request: () => fetchDict({ dictKey :'@ruleProductNo'}),
           fieldProps: {
            treeDefaultExpandAll: true,
            treeCheckable:true,
@@ -433,8 +445,8 @@ const info: React.FC<widowProp> = (prop:widowProp) => {
             <SDFormText name="riskExposureSuperName"  label="上级项目名称"/>
             <SDFormDict name="riskExposureIsmini" dictKey="YESORNO" label="是否最细一级"/>
             {riskWeightFlag && <SDFormText name="riskExposureWeight" required={true}   label="默认权重(%)"/>}
-            <SDFormDict name="defaultOut" dictKey='CUST_TYPE_LV02'  label="默认输出数据源"/>
-            <SDFormDict name="riskExposureStageId" dictKey='CUST_TYPE_LV02' label="所属阶段"/>
+            <SDFormDict name="defaultOut" dictKey='@selectdefaultOut1' dictParam={`{"defaultOut":"${defaultOut}"}`}  label="默认输出数据源"/>
+            {offobjec && (<SDFormDict name="riskExposureStageId" dictKey='@offobjectStageId' label="所属阶段"/>)}
             <SDFormText name="riskExposureIndex"  label="认定顺序号"/>
             <SDFormText name="riskExposureState" readonlyCond='both' label="状态"/>
         </SDForm>
@@ -501,10 +513,10 @@ const info: React.FC<widowProp> = (prop:widowProp) => {
               callback();
             }
          }}]}/>
-          <SDFormDict name="ruleProductNo"  dictKey='CUST_TYPE_LV02' rules={[{required:true}]} label="产品名称"/>
+          <SDFormDict name="ruleProductNo"  dictKey='@ruleProductNo' rules={[{required:true}]} label="产品名称"/>
           <SDFormText name="riskExposureWeight"  label="权重(%)"/>
-          <SDFormDict name="ruleIn" dictKey='CUST_TYPE_LV02' rules={[{required:true}]} label="输入数据源"/>
-          <SDFormDict name="ruleOut" dictKey='CUST_TYPE_LV02' rules={[{required:true}]} label="输出数据源" />
+          <SDFormDict name="ruleIn" dictKey='@ruleIn1' rules={[{required:true}]} label="输入数据源"  dictParam={`{"defaultOut":"${defaultOut}"}`}/>
+          <SDFormDict name="ruleOut" dictKey='@selectdefaultOut1' rules={[{required:true}]} label="输出数据源"     dictParam={`{"defaultOut":"${defaultOut}"}`} />
           <SDFormText name="ruleIndex" required={true}  label="执行序号" />
           <SDFormText name="ruleGetdata" required={true} type="textarea" label="风险暴露分类认定规则"/>
       </SDModalForm>

Procedure/frontend/projectb/src/pages/rwa_calc_config_002offbalanceprotype/info_list.tsx

@@ -83,7 +83,7 @@ return data;
   }
 
   const formInit = async (offobjectNo : any) => {
-    const getoffobjectStage = await getoffobjectStageId(offobjectNo);
+    const getoffobjectStage = await getoffobjectStageId(offobjectNo); // 查询根节点的所属阶段
     const data1 = await getDetail1(offobjectNo,getoffobjectStage);
     //const getoffobjectStage = await getoffobjectStageId(offobjectNo);
     setDefaultOut(getoffobjectStage);

Procedure/frontend/projectb/src/pages/rwa_calc_config_003regularrrcsrule/releasetoolinfo.tsx

@@ -58,6 +58,7 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
     // 缓释工具类型修改查询查询
     const selecReleaseTypeData = async (formdata : ReleaseToolTypeModel) => {
       const data = await selectReleaseToolType(formdata);
+      setRegularRrcsRuleStageId(data.regularRrcsRuleStageId);
       if (data && data.regularRrcsRuleNo) {
         formRef.current?.setFieldsValue(data);
         setReleaseToolKey(data.regularRrcsRuleNo);
@@ -243,8 +244,8 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
           title: '状态', 
           dataIndex: 'regularRrcsRuleState',
           hideInTable: false,
-          valueType: 'treeSelect',
-          request: () => fetchDict('CUST_TYPE_LV02'),
+          valueType: 'select',
+            request: () => fetchDict({dictKey: '@zhuangtai'}),
           fieldProps: {
            treeDefaultExpandAll: true,
         },
@@ -424,6 +425,7 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
               setEditType('create');
               setRuleFormData([]);
               setReleaseToolKey('');
+              setRegularRrcsRuleStageId('');
             }}
           >
             新增
@@ -448,6 +450,8 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
             setReleaseToolKey(formRef.current?.getFieldValue('regularRrcsRuleNo'));
             if(values.regularRrcsRuleStageId != undefined && values.regularRrcsRuleStageId !=''){
               setRegularRrcsRuleStageId(values.regularRrcsRuleStageId);
+            }else{
+              setRegularRrcsRuleStageId('');
             }
           }}
           footer={[
@@ -533,7 +537,7 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
             >
             <SDAreaTtile title='认定规则'/>
             <SDFormText name="detailRuleNo" readonlyCond="both" label="规则编号"/>
-            <SDFormText name="detailRuleName"  label="规则说明" />
+            <SDFormText name="detailRuleName"  label="规则说明" placeholder={'规则说明中需包含担保类型以及使用的缓释品类型。例如：非回购类业务质押单位大额存单；回购类业务质押国债；保证人担保等'} />
             <SDFormDict name="detailRuleDataIn" dictKey='@ruleIn1'   dictParam={`{"defaultOut":"${regularRrcsRuleStageId}"}`}  label="输入数据源"/>
             <SDFormDict name="detailRuleDataOut" dictKey='@selectdefaultOut1'   dictParam={`{"defaultOut":"${regularRrcsRuleStageId}"}`} label="输出数据源"/>
             <SDFormText name="detailRuleIndex" label="执行序号"/>

Procedure/frontend/projectb/src/pages/rwa_calc_config_acquisition/rule.tsx

@@ -35,6 +35,8 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
     /** 声明字典  */
     const { fetchDict } = useModel('dict');
 
+    const [ledgerOffObjectNo,setLedgerOffObjectNo] = useState<any>();
+
     // 页面数据
     var formDataList = new Array<SysListModel>;
     /**上传文件 */
@@ -49,6 +51,11 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
     // 修改查询查询
     const selectData = async (formdata : SysListModel) => {
       const data = await selectDetailData(formdata);
+      if(data.resultType == '2'){
+        setLedgerOffObjectNo(true);
+      }else{
+        setLedgerOffObjectNo(false);
+      }
       formRef.current?.setFieldsValue(data);
      }
 
@@ -301,10 +308,13 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
             if (changevalues.resultType != undefined) {
               if (changevalues.resultType == '1') {
                 formRef.current?.setFieldValue('onOrOff','表内');
+                setLedgerOffObjectNo(false);
               } else if (changevalues.resultType == '2') {
                 formRef.current?.setFieldValue('onOrOff','表外');
+                setLedgerOffObjectNo(true);
               } else {
                 formRef.current?.setFieldValue('onOrOff','');
+                setLedgerOffObjectNo(false);
               }
             }
           }}
@@ -322,7 +332,7 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
           formRef={formRef}
         >
             <SDAreaTtile title='缓释品信息'/>
-            <SDFormText name="ruleNo" rules={[{max:20, message:'名称长度不能超过20位'}]} label="规则编号"/>
+            <SDFormText name="ruleNo" rules={[{max:20, message:'名称长度不能超过20位'}]} label="规则编号" readonlyCond = 'update'/>
             <SDFormText name="ruleName" label="规则名称" rules={[{max:30, message:'名称长度不能超过30位'}]} />
             <SDFormDict name="subjectCodes" dictKey="SUBJECTCODE"  label="科目代码" />
             <SDFormText name="subjectNames"  label="科目名称" />
@@ -330,12 +340,11 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
             <SDFormDict name="calcMode" dictKey="CALC_METHOD" label="计算方式"/>
             <SDFormDict name="getdataMode"  label="取值方式" dictKey="GETDATA_MODE" />
             <SDFormDict name="resultType" dictKey="RESULT_TYPE"  label="计算项" />
-            <SDFormText name="onOrOff"  label="表内外标识" />
+            <SDFormText name="onOrOff"  label="表内外标识" readonlyCond = 'both' />
             <SDFormDict name="ledgerRiskexposureNo"  label="表内风险暴露分类" dictKey="@positiveRiskType" />
-            <SDFormDict name="ledgerOffObjectNo"  label="表外项目分类"  dictKey="@positiveOffProjectType"/>
+            <SDFormDict name="ledgerOffObjectNo"  label="表外项目分类" required={ledgerOffObjectNo} dictKey="@positiveOffProjectType"/>
             <SDFormDict name="ledgerStageId"  label="所属阶段" dictKey="@stageinId" />
-            <SDFormText name="ledgerGetdataRule" 
-            type="textarea" label="总账取数规则"/>
+            <SDFormText name="ledgerGetdataRule"  type="textarea" label="总账取数规则"/>
          
         </SDModalForm>
         

Procedure/frontend/projectb/src/pages/rwa_calc_config_dataparam/bussiness.tsx

@@ -54,6 +54,10 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
     const [subjectMockData, setSubjectMockData] = useState<subjectListModel[]>([]);
 
     const [mockDetailData, setMockDetailData] = useState<rwaCalcConfProductrulesModel[]>([]);
+
+    const [defaultOut,setDefaultOut] = useState<any>();
+
+    var formDataList1 = new Array<productListModel>;
  
     useEffect(() => {
       }, []);
@@ -88,7 +92,7 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
 
 
   /**查询产品列表 */
-  const selectProductList= async (record: SysListModel) => {
+  const selectProductList= async (record: any) => {
     if (record.businessCode) {
       const data =  await selectProductData(record.businessCode);
       setMockData(data);
@@ -242,18 +246,23 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
       {
         title: '产品分类',
         dataIndex: 'productType',
+        valueType:'select',
+        request:()=>fetchDict({dictKey : 'PRODUCT_TYPE'}),
         search: false,
         hideInTable: false,
       },
       {
         title: '表内外标识',
         dataIndex: 'onOrOff',
+        request:()=>fetchDict({}),
         search: false,
         hideInTable: false,
       },
       {
         title: '来源系统',
-        dataIndex: 'productFromSystem',
+        dataIndex: 'productFromSystems',
+        valueType:'select',
+        request:()=>fetchDict({ dictKey : 'PRODUCTFROMSYSTEM'}),
         search: false,
         hideInTable: false,
       },
@@ -269,10 +278,17 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
           onClick={async ()=>{
             setProductDetailList(true);
             // 产品参数查看实现
-            const detailData = await product_modifyone1(record.productNo);
+            const detailData1 = await product_modifyone1(record.productNo);
+            const colorsArray = detailData1.productFromSystems.split(',');
+            let i=0;
+            productDetailRef.current?.setFieldValue("productFromSystem",colorsArray)
+            
+            const {productFromSystem,...detailData}=detailData1
+            setDefaultOut(detailData.productStageId);
             productDetailRef.current?.setFieldsValue(detailData);
             const detailList = await product_querylist(record.productNo);
             setMockDetailData(detailList);
+            setEditType('display')
           } }
           >
           查看
@@ -316,6 +332,8 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
       {
         title: '数据类型',
         dataIndex: 'dataType',
+        valueType:'select',
+        request:()=>fetchDict({ dictKey :'DATA_TYPE'}),
         search: false,
         hideInTable: false,
       },
@@ -376,6 +394,8 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
 
       { title : '数据类型',
       dataIndex : 'dataType',
+      valueType:'select',
+      request:()=>fetchDict({ dictKey :'DATA_TYPE'}),
       width : 150
       },
       
@@ -385,12 +405,12 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
       },
       
       { title : '输入数据源',
-      dataIndex : 'ruleIn',
+      dataIndex : 'ruleInName',
       width : 150
       },
       
       { title : '输出数据源',
-      dataIndex : 'ruleOut',
+      dataIndex : 'ruleOutName',
       width : 150
       },
       
@@ -513,12 +533,12 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
     }>
      <SDFormText name="productNo"   label="产品代码"  />
     <SDFormText name="productName"   label="产品名称"  />
-    <SDFormText name="productType"   label="产品大类"  />
+    <SDFormDict name="productType"   label="产品大类"  dictKey='PRODUCT_TYPE'  />
     <SDFormText name="productIndex"   label="产品序号"  />
-    <SDFormText name="productStageId"   label="所属阶段"  />
-    <SDFormText name="productFromSystem"   label="来源系统"  />
-    <SDFormText name="defaultOut"   label="默认输出数据源"  />
-    <SDFormText name="productBussinessCode"   label="所属业务"  />
+    <SDFormDict name="productStageId"   label="所属阶段" dictKey ='@productStageId' />
+    <SDFormDict name="productFromSystem"   label="来源系统"  dictKey='PRODUCTFROMSYSTEM' />
+    <SDFormDict name="defaultOut"   label="默认输出数据源"  dictKey='@selectdefaultOut'   dictParam={`{"defaultOut":"${defaultOut}"}`} />
+    <SDFormDict name="productBussinessCode"   label="所属业务" dictKey='@BUSSINESS_CODE' />
     <SDFormText name="defaultGetdatarule"   label="默认取数逻辑"  />
 
       <SDAreaTtile title='科目取数规则列表' />

Procedure/frontend/projectb/src/pages/rwa_calc_config_dataparam/product_list.tsx

@@ -398,6 +398,8 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
 
         { title : '数据类型',
         dataIndex : 'dataType',
+        valueType:'select',
+        request:()=>fetchDict({ dictKey :'DATA_TYPE'}),
         width : 150
         },
         

Procedure/frontend/projectb/src/services/rwa/dataquality/CollateralTable.ts

@@ -50,6 +50,10 @@ export type SysListModel = {
     mitigantToolExpiryDate?:string;
     // 是否第一顺位权
     ifFirstPriorityRight?:string;
+    //缓释品类型编码
+    mitigationProdTypeCode:string;
+    //缓释品类型名称
+    mitigationProdTypeName:string;
   } & BasePageModel;
 
   /** 获取页面初始化查询 POST*/

Procedure/frontend/projectb/src/services/rwa/dataquality/CustomerTable.ts

@@ -29,7 +29,7 @@ export type SysListModel = {
     // 交易对手证件类型
     tradeCntrptyDocumentTypeDesc?:string;
     // 交易对手证件号码
-    customerLicenceNo?:string;
+    tradeCntrptyDocumentNo?:string;
     // 企业规模代码
     entScaleCodes?:string[];
     // 企业规模代码

Procedure/frontend/projectb/src/services/rwa/dataquality/DiscountTable.ts

@@ -84,6 +84,8 @@ export type SysListModel = {
     clientNo?:string;
     //客户名称
     clientName?:string;
+    discountingTypes:string[];
+    manageOrgnNos:string[];
   } & BasePageModel;
 
   /** 获取页面初始化查询 POST*/

Procedure/frontend/projectb/src/services/rwa/product/datasupplementary/supplementtaskmanagement.ts

@@ -35,6 +35,7 @@ export type SupplementTaskDefineModel = {
     status: string;
     tmpCode:string;
     orgCodes:string[]
+    account1:String;
   } & BasePageModel;
 
 
@@ -60,6 +61,7 @@ export type SupplementTaskDefineModel = {
     remark: string;
     // 模板名称
     tmpName: string;
+    id : string;
   } & BasePageModel;
 
 

Procedure/frontend/projectb/src/services/rwa/product/rwa_calc_config_004rwa/creditriskmeteringrule.ts

@@ -72,6 +72,8 @@ productType : String;
 productBussinessCode : String;
 //来源系统
 productFromSystem : String;
+
+productStageId : String
 }
 
 

Procedure/frontend/projectb/src/services/rwa/rwa_calc_config_001riskexposure/info.ts

@@ -154,3 +154,9 @@ export async function deleteFunc(code: string[]) {
   });
 }
 
+export async function getoffobjectStageId(offobjectNo:string){
+  return baseFun.request<riskExposureDefinitionModel>('/api/product/rwa/rwacalcconfig001riskexposure/InfoAction/getoffobjectStageId',{
+     params:{offobjectNo}
+  })
+  ;
+}

Procedure/frontend/projectb/src/services/rwa/rwa_calc_config_dataparam/bussiness.ts

@@ -49,6 +49,7 @@ export type productListModel={
     defaultGetdatarule:String;
     //默认输出
     defaultOut:String; 
+    productFromSystems:string;
 } & BasePageModel;