增加下拉列表的控制及联动

Procedure/backend/project/src/main/java/com/sundata/product/rwa/dataquality/model/TableRelationDefineModel.java

@@ -29,6 +29,15 @@ public class TableRelationDefineModel {
     private String englishTargetTableNames;
     private String englishSourceTableNames;
     private String[] riskCategorys;
+    private String[] sourceSystems;
+
+    public String[] getSourceSystems() {
+        return sourceSystems;
+    }
+
+    public void setSourceSystems(String[] sourceSystems) {
+        this.sourceSystems = sourceSystems;
+    }
 
     public String[] getRiskCategorys() {
         return riskCategorys;

Procedure/backend/project/src/main/java/com/sundata/product/rwa/dataquality/mybatis/DataScopeManageMapper.xml

@@ -40,8 +40,10 @@
                 </foreach>
 <!--                and RISK_CATEGORY like concat(concat('%', #{model.riskCategory}),'%')-->
             </if>
-            <if test="model.sourceSystem != null and model.sourceSystem !=''">
-                and SOURCE_SYSTEM like concat(concat('%', #{model.sourceSystem}),'%')
+            <if test="model.sourceSystems != null and model.sourceSystems !=''">
+                <foreach collection="model.sourceSystems" item="item" open="and SOURCE_SYSTEM in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/action/InfoListAction.java

@@ -30,11 +30,11 @@ public class InfoListAction extends BaseAction {
     }
 
     @RequestMapping({"getDetail1"})
-    public InfoListModel getFunTree1(HttpServletRequest request, HttpServletResponse response, @RequestParam String offobjectNo) {
+    public InfoListModel getFunTree1(HttpServletRequest request, HttpServletResponse response, @RequestParam String offobjectNo,@RequestParam String offobjectStage) {
        System.out.println(offobjectNo);
         InfoListModel funinfo =this.infoListService.queryOne(offobjectNo);
         System.out.println(funinfo);
-        funinfo.setButtonList(this.infoListService.rules_list(offobjectNo));
+        funinfo.setButtonList(this.infoListService.rules_list(offobjectNo,offobjectStage));
       //  return funinfo;
         System.out.println(funinfo);
         return funinfo;
@@ -48,9 +48,9 @@ public class InfoListAction extends BaseAction {
     }
 
     @RequestMapping({"rules_list"})
-    public void rules_list(HttpServletRequest request, HttpServletResponse response, @RequestParam String offobjectNo){
+    public void rules_list(HttpServletRequest request, HttpServletResponse response, @RequestParam String offobjectNo,@RequestParam String offobjectStage){
 //        String offobjectNo =data.getOffobjectNo();
-        sendData(response,infoListService.rules_list(offobjectNo));
+        sendData(response,infoListService.rules_list(offobjectNo,offobjectStage));
     }
 
     @RequestMapping({"save"})

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

@@ -12,7 +12,7 @@ public interface InfoListMapper<T> extends BaseMapper<T> {
     List<DictContent> getFunTree1();
     List<RwaCalcConfOffbalanceprotyperuleModel> queryButtons(@Param("offobjectNo") String getOffobjectNo);
      void rules_addone(RwaCalcConfOffbalanceprotyperuleModel data);
-     List<RwaCalcConfOffbalanceprotyperuleModel>rules_list(@Param("offobjectNo") String getOffobjectNo);
+     List<RwaCalcConfOffbalanceprotyperuleModel>rules_list(@Param("offobjectNo") String getOffobjectNo,@Param("offobjectStage") String offobjectStage);
 
     void info_deleteone(@Param("offobjectNo") String offobjectNo);
     void info_deleteone1(@Param("offobjectNo") String offobjectNo);

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

@@ -81,6 +81,7 @@
     left join SYS_SQLEDIT_DEF_DATACLASS t3
     on t2.STEP_IN = t3.dataclasscode
     where t1.OFFOBJECT_NO = #{offobjectNo}
+    and t2.STEP_STAGE_ID = #{offobjectStage}
     )T2
     ON T1.RULE_IN =T2.RULE_IN
     AND T1.RULE_NO =T2.RULE_NO
@@ -92,6 +93,7 @@
     left join SYS_SQLEDIT_DEF_DATACLASS t3
     on t2.STEP_IN = t3.dataclasscode
     where t1.OFFOBJECT_NO = #{offobjectNo}
+        and t2.STEP_STAGE_ID = #{offobjectStage}
     )T3
     ON T1.RULE_OUT =T3.RULE_OUT
     AND T1.RULE_NO =T3.RULE_NO

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/service/InfoListService.java

@@ -51,8 +51,8 @@ public  class InfoListService extends BaseService<InfoListModel> implements Comm
         infoListMapper.rules_addone(data);
 
     }
-    public List<RwaCalcConfOffbalanceprotyperuleModel>rules_list (String offobjectNo){
-        return  infoListMapper.rules_list(offobjectNo);
+    public List<RwaCalcConfOffbalanceprotyperuleModel>rules_list (String offobjectNo,String offobjectStage){
+        return  infoListMapper.rules_list(offobjectNo,offobjectStage);
     }
 
 

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

@@ -24,6 +24,16 @@ public class MeteringRuleModel {
     // 规则序号
     private String creditRiskIndex;
 
+    private String[] creditRiskBussinessCodes;
+
+    public String[] getCreditRiskBussinessCodes() {
+        return creditRiskBussinessCodes;
+    }
+
+    public void setCreditRiskBussinessCodes(String[] creditRiskBussinessCodes) {
+        this.creditRiskBussinessCodes = creditRiskBussinessCodes;
+    }
+
     public String getCalcIndex() {
         return calcIndex;
     }

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

@@ -26,8 +26,11 @@
             <if test="model.creditRiskName != null and model.creditRiskName !=''">
                 and CREDITRISK_NAME like concat(concat('%', #{model.creditRiskName}),'%')
             </if>
-            <if test="model.creditRiskBussinessCode != null and model.creditRiskBussinessCode !=''">
-                and CREDITRISK_BUSSINESS_CODE like concat(concat('%', #{model.creditRiskBussinessCode}),'%')
+            <if test="model.creditRiskBussinessCodes != null and model.creditRiskBussinessCodes !=''">
+<!--                and CREDITRISK_BUSSINESS_CODE like concat(concat('%', #{model.creditRiskBussinessCode}),'%')-->
+                <foreach collection="model.creditRiskBussinessCodes" item="item" open="and CREDITRISK_BUSSINESS_CODE  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>
@@ -284,7 +287,7 @@
         T2.PRODUCT_NAME                      AS      productName,
         T2.PRODUCT_TYPE                      AS      productType,
         T2.PRODUCT_BUSSINESS_CODE            AS      productBussinessCode,
-        T2.PRODUCT_FROM_SYSTEM               AS      productFromSystem
+        REPLACE(T2.PRODUCT_FROM_SYSTEM,CHR(32),'' )              AS      productFromSystem
         FROM RWA_CALC_CONF_CREDITRISK T1
         INNER JOIN RWA_CALC_CONF_PRODUCT T2
         ON T2.PRODUCT_BUSSINESS_CODE = T1.CREDITRISK_BUSSINESS_CODE

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

@@ -176,11 +176,24 @@ const datascopemanage : React.FC<widowRush> = (prop:widowRush) => {
           hideInTable: true,
           search:false
         },
+        {
+          title: '来源系统', 
+          dataIndex: 'sourceSystems',
+          hideInTable: true,
+          valueType:'treeSelect',
+          fieldProps:{
+            treeDefaultExpandAll:true,
+            treeCheckable:true,
+          },
+          request:()=>fetchDict({dictKey:"PRODUCTFROMSYSTEM"}),
+          order:-6
+        },
         {
           title: '来源系统', 
           dataIndex: 'sourceSystem',
           hideInTable: false,
-          valueType:'select',
+          valueType:'treeSelect',
+          search:false,
           request:()=>fetchDict({dictKey:"PRODUCTFROMSYSTEM"}),
           order:-6
         },

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

@@ -62,7 +62,7 @@ const datasupplementation : React.FC<widowRush> = (prop:widowRush) => {
     const selectData = async (formdata : DataSupplementTaskExampleModel) => {
       const data = await selectDetailData(formdata);
       formRef.current?.setFieldsValue(data);
-     
+
      }
 
 
@@ -392,6 +392,7 @@ const templateCheckColumns: ProColumns<DataSupplementInstancesIntaskModel>[] = [
         <ProTable
           search={false}
           rowKey="index"
+          formRef={formRef}
           columns={templateCheckColumns}
           dataSource={templateCheckData}
         />

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

@@ -27,6 +27,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
     /** 是否excel公式字段是否必输 */
     const [excelFormulaFlag, setExcelFormulaFlag] = useState<boolean>(false);
     const [sqlCode,setSqlCode] = useState<boolean>(false);
+    const [dateType,setDateType] = useState<boolean>(false);
     const [currentRow, setCurrentRow] = useState<SupplementTaskDefineModel>();
     /** 表格引用对象，刷新表格使用   */
     const actionRef = useRef<ActionType>();
@@ -229,13 +230,13 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
           title: '模板编号', 
           dataIndex: 'tmpCode',
           hideInTable: true,
-          search: false,
+      //    search: false,
         },
         {
           title: '模板名称', 
           dataIndex: 'tmpNames',
           hideInTable: true,
-          search: false,
+      //    search: false,
         },
         {
           title: '包含模板', 
@@ -338,6 +339,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             search: false,
             hideInTable: false,
             valueType:'treeSelect',
+         //   request:()=>fetchDict({ dictKey : '@tmpCode'}),
             formItemProps:{
               rules:[
                 {required:true},
@@ -496,6 +498,8 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             title: '行列类型', 
             dataIndex: 'tmpverRowColType',
             hideInTable: false,
+            valueType:'select',
+            request:()=>fetchDict({ dictKey :'ROW_COLUMN_TYPE'}),
             width:150,
             ellipsis:true,
             formItemProps:{
@@ -566,7 +570,11 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             dataIndex: 'dataType',
             hideInTable: false,
             width:150,
-            ellipsis:true
+            ellipsis:true,
+            formItemProps:{
+              rules:[
+                {required:excelFormulaFlag},]
+            }
           },
           {
             title: '约束公式', 
@@ -780,10 +788,17 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                   if (value?.checkType) {
                     if (value.checkType == 'EXCEL_FORMULA') {
                       setExcelFormulaFlag(true);
+                      setExcelFormulaFlag(false);
+                      setDateType(false);
                     } else if (value.checkType == 'SQL_STATEMENT') {
                       setSqlCode(true);
                       setExcelFormulaFlag(false);
-                    } else {
+                      setDateType(false);
+                    }else if(value.checkType == 'DATA_TYPE'){
+                      setDateType(true);
+                      setSqlCode(false);
+                      setExcelFormulaFlag(false);
+                    }  else {
                       setSqlCode(false);
                       setExcelFormulaFlag(false);
                     }

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

@@ -59,6 +59,8 @@ const creditriskmeteringrule : React.FC<widowProps> = (prop:widowProps) => {
     // 默认输出源
     const [productKey,setProductKey] = useState<any>();
 
+    const [creditRiskBussinessCode,setCreditRiskBussinessCode] = useState<any>();
+
     useEffect(() => {
       }, []);
     
@@ -240,9 +242,29 @@ const creditriskmeteringrule : React.FC<widowProps> = (prop:widowProps) => {
             title: '所属业务', 
             dataIndex: 'creditRiskBussinessCode',
             hideInTable: false,
+            search:false,
+            valueType:'treeSelect',
+            request:()=>fetchDict({ dictKey :'@BUSSINESS_CODE' }),
+            fieldProps:{
+              treeDefaultExpandAll: true,
+              treeCheckable:true,
+            },
             width:150,
             ellipsis:true,
         },
+        {
+          title: '所属业务', 
+          dataIndex: 'creditRiskBussinessCodes',
+          hideInTable: true,
+          valueType:'treeSelect',
+          request:()=>fetchDict({ dictKey :'@BUSSINESS_CODE' }),
+          fieldProps:{
+            treeDefaultExpandAll: true,
+            treeCheckable:true,
+          },
+          width:150,
+          ellipsis:true,
+      },
         {
             title: '默认规则', 
             dataIndex: 'defaultRule',
@@ -496,11 +518,13 @@ const productColumns: ProColumns<productListModel>[] = [
     { title : '产品大类',
     dataIndex : 'productType',
     valueType:"select",
-    request:()=>fetchDict(''),
+    request:()=>fetchDict('PRODUCT_TYPE'),
     width : 150
     },
     { title : '来源系统',
     dataIndex : 'productFromSystem',
+    //valueType:"select",
+    //request:()=>fetchDict( {dictKey :"@productFromSystems"}),
     search:false,
     hideInTable:false,
     width : 150
@@ -679,6 +703,9 @@ return (
       }}
       onValuesChange={(changevalue,values)=>{
         setStageConfigKey(formRef.current?.getFieldValue('creditRiskNo'));
+        if(values.creditRiskBussinessCode != undefined && values.creditRiskBussinessCode!=''){
+          setCreditRiskBussinessCode(values.creditRiskBussinessCode);
+        }
       }}
       footer={[
       <SDSubmitButton  editType={editType}   formRef={formRef} doSubmit={handleReleaseTypeSave} >保存</SDSubmitButton>,
@@ -704,6 +731,7 @@ return (
               creditRiskNo: creditRiskNo,
               creditRiskName: "",
               creditRiskBussinessCode: "",
+              creditRiskBussinessCodes:[""],
               defaultRule: "",
               defaultOut: "",
               creditRiskIndex: ""
@@ -719,8 +747,8 @@ return (
               callback();
             }
          }}]} label="规则名称"/>
-        <SDFormDict dictKey='org' required={true} name="creditRiskBussinessCode" label="所属业务" />
-        <SDFormDict dictKey='org' required={true} name="defaultOut" label="默认输出数据源"/>
+        <SDFormDict required={true} name="creditRiskBussinessCode" label="所属业务" dictKey ='@BUSSINESS_CODE' />
+        <SDFormDict  required={true} name="defaultOut" label="默认输出数据源" dictKey='org'  />
         <SDFormText name="creditRiskIndex" required={true} label="规则序号"/>
         <SDFormText name="defaultRule" required={true} type="textarea"  label="默认规则"/>
          <SDLayout>

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

@@ -83,8 +83,9 @@ return data;
   }
 
   const formInit = async (offobjectNo : any) => {
-    const data1 = await getDetail1(offobjectNo);
     const getoffobjectStage = await getoffobjectStageId(offobjectNo);
+    const data1 = await getDetail1(offobjectNo,getoffobjectStage);
+    //const getoffobjectStage = await getoffobjectStageId(offobjectNo);
     setDefaultOut(getoffobjectStage);
     if (!data1.buttonList) data1.buttonList = [];
     let i = 0;
@@ -139,7 +140,7 @@ function formatArray (arr:DictTree[]) {
   const inst2 = async(formData:rwaCalcConfOffbalanceprotyperuleModel)=>{
     await rules_addone(formData)
     actionRef1.current?.reloadAndRest?.();
-    const res1 =await rules_list(state1);
+    const res1 =await rules_list(state1,defaultOut);
     setMockData(res1)
     
     setVisible1(false);
@@ -156,7 +157,7 @@ baseFun.confirm("请确认是否继续操作",async()=>{
   const sd = await rules_deleteone(record.ruleNo)
     setEditType1('update');
 //   refreshTree().then((data) => {
-  const sd1=await rules_list(state1);
+  const sd1=await rules_list(state1,defaultOut);
   setMockData(sd1);
 // });;
 })
@@ -582,7 +583,7 @@ const setRuleNoAdd = () => {
  <SDButton successMessage="" onClick={() => closeAndRefresh1()}>关闭</SDButton>]} onVisibleChange={()=>{setVisible1(false); }  } 
  >
 <SDLayout>
-<SDForm editType={editType1} formRef={formRef2}   initialValues={{ruleNo:editRuleNo,offobjectNo:state1}} >
+<SDForm editType={editType1} formRef={formRef2}   initialValues={{ruleNo:editRuleNo,offobjectNo:state1,offobjectStageId:defaultOut}} >
   <span style={{display:'none'}}>
 <SDFormText name="calcindex"   label="计算实例号"  />
 <SDFormText name="sdate"   label="起始数据日期"  />
@@ -590,6 +591,7 @@ const setRuleNoAdd = () => {
 <SDFormText name="term"   label="年月"  />
 <SDFormText name="dataDate"   label="数据日期"  />
 <SDFormText name="offobjectNo"   label="表外项目编号"  />
+<SDFormText name ="offobjectStageId" label=' ="所属阶段"'/>
 </span>
 <SDFormText name="ruleNo"   label="规则编号" readonlyCond='both'  />
 <SDFormText name="ruleName" required  label="规则名称" rules={[{validator:(rules,value,callback)=>{

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

@@ -42,6 +42,8 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
     const [releaseToolKey, setReleaseToolKey] = useState<any>();
     const [allSelectedRowKeys, setAllSelectedRowKeys] = useState<Key[]>();
 
+    const [regularRrcsRuleStageId,setRegularRrcsRuleStageId] = useState<any>();
+
     // 页面数据
     var formDataList = new Array<ReleaseToolTypeModel>;
 
@@ -444,6 +446,9 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
           }}
           onValuesChange={(changevalue,values)=>{
             setReleaseToolKey(formRef.current?.getFieldValue('regularRrcsRuleNo'));
+            if(values.regularRrcsRuleStageId != undefined && values.regularRrcsRuleStageId !=''){
+              setRegularRrcsRuleStageId(values.regularRrcsRuleStageId);
+            }
           }}
           footer={[
           <SDSubmitButton  editType={editType}   formRef={formRef} doSubmit={handleReleaseTypeSave} >保存</SDSubmitButton>,
@@ -477,8 +482,8 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
               callback();
             }
          }}]}/>
-            <SDFormDict name="regularRrcsRuleOut" dictKey='CUST_TYPE_LV02'  label="默认输出数据源" />
-            <SDFormDict name="regularRrcsRuleStageId" dictKey='CUST_TYPE_LV02' label="所属阶段"/>
+            <SDFormDict name="regularRrcsRuleOut" dictKey='@selectdefaultOut1'   dictParam={`{"defaultOut":"${regularRrcsRuleStageId}"}`}  label="默认输出数据源" />
+            <SDFormDict name="regularRrcsRuleStageId"  label="所属阶段" dictKey='@stageinId'/>
             <SDFormText name="baseWeight" label="基础权重(%)"/>
             <SDFormText name="exemptionWeight" label="豁免后权重(%)"/>
             <SDFormText name="regularRrcsRuleIndex" label="认定顺序号"/>
@@ -529,8 +534,8 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
             <SDAreaTtile title='认定规则'/>
             <SDFormText name="detailRuleNo" readonlyCond="both" label="规则编号"/>
             <SDFormText name="detailRuleName"  label="规则说明" />
-            <SDFormDict name="detailRuleDataIn" dictKey='CUST_TYPE_LV02' label="输入数据源"/>
-            <SDFormDict name="detailRuleDataOut" dictKey='CUST_TYPE_LV02' label="输出数据源"/>
+            <SDFormDict name="detailRuleDataIn" dictKey='@ruleIn1'   dictParam={`{"defaultOut":"${regularRrcsRuleStageId}"}`}  label="输入数据源"/>
+            <SDFormDict name="detailRuleDataOut" dictKey='@selectdefaultOut1'   dictParam={`{"defaultOut":"${regularRrcsRuleStageId}"}`} label="输出数据源"/>
             <SDFormText name="detailRuleIndex" label="执行序号"/>
             <SDFormText type="textarea" name="detailRuleGetData" label="合格缓释认定规则"/>
             <SDFormText type="textarea" name="exemptionRules" label="豁免规则"/>

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

@@ -180,10 +180,10 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
           dataIndex: 'ledgerRiskexposureNo',
           hideInTable: false,
           valueType: 'treeSelect',
-          request: () => fetchDict('businessScale'),
+          request: () => fetchDict('@positiveRiskType'),
           fieldProps: {
            treeDefaultExpandAll: true,
-           treeCheckable:true,
+        //   treeCheckable:true,
           },
         },
         {
@@ -191,10 +191,10 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
           dataIndex: 'ledgerOffObjectNo',
           hideInTable: false,
           valueType: 'treeSelect',
-          request: () => fetchDict('businessScale'),
+          request: () => fetchDict('@positiveOffProjectType'),
           fieldProps: {
            treeDefaultExpandAll: true,
-           treeCheckable:true,
+       //    treeCheckable:true,
           },
         },
         {
@@ -299,9 +299,9 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
               formRef.current?.setFieldValue('subjectNames',value);
             }
             if (changevalues.resultType != undefined) {
-              if (changevalues.resultType == '01') {
+              if (changevalues.resultType == '1') {
                 formRef.current?.setFieldValue('onOrOff','表内');
-              } else if (changevalues.resultType == '02') {
+              } else if (changevalues.resultType == '2') {
                 formRef.current?.setFieldValue('onOrOff','表外');
               } else {
                 formRef.current?.setFieldValue('onOrOff','');
@@ -326,14 +326,14 @@ const rule : React.FC<widowRush> = (prop:widowRush) => {
             <SDFormText name="ruleName" label="规则名称" rules={[{max:30, message:'名称长度不能超过30位'}]} />
             <SDFormDict name="subjectCodes" dictKey="SUBJECTCODE"  label="科目代码" />
             <SDFormText name="subjectNames"  label="科目名称" />
-            <SDFormDict name="accountingDirection" dictKey="ACCOUNTDIRECTION"  label="记账方向"/> 
-            <SDFormDict name="calcMode" dictKey="CALCULATIONMETHOD" label="计算方式"/>
-            <SDFormDict name="getdataMode"  label="取值方式" />
-            <SDFormDict name="resultType" dictKey="CALC_ITEMS"  label="计算项" />
+            <SDFormDict name="accountingDirection" dictKey="ACCOUNTING_DIRECTION"  label="记账方向"/> 
+            <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="表内外标识" />
-            <SDFormDict name="ledgerRiskexposureNo"  label="表内风险暴露分类" />
-            <SDFormDict name="ledgerOffObjectNo"  label="表外项目分类" />
-            <SDFormDict name="ledgerStageId"  label="所属阶段" />
+            <SDFormDict name="ledgerRiskexposureNo"  label="表内风险暴露分类" dictKey="@positiveRiskType" />
+            <SDFormDict name="ledgerOffObjectNo"  label="表外项目分类"  dictKey="@positiveOffProjectType"/>
+            <SDFormDict name="ledgerStageId"  label="所属阶段" dictKey="@stageinId" />
             <SDFormText name="ledgerGetdataRule" 
             type="textarea" label="总账取数规则"/>
          

Procedure/frontend/projectb/src/pages/rwa_data_check/diffconfig_list.tsx

@@ -329,7 +329,8 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
              
             }
           }
-          if(Values.ruleAreaType=='05'){
+          if(Values.ruleAreaType=='05' && changedValues.ruleAreaType =='05'){
+            setMockData([])
               setVisible2(true)
           }else{
               setVisible2(false)

Procedure/frontend/projectb/src/services/rwa/info_list.ts

@@ -76,9 +76,9 @@ ruleProductName:string;
 
 
 /** 获取菜单及按钮详情 POST /api/admin/funmanage/getDetail.do */
-export function getDetail1(offobjectNo: any) {
+export function getDetail1(offobjectNo: any,offobjectStage : any) {
     return baseFun.request<rwaCalcConfOffbalanceprotypeModel>('/api/product/rwa/rwaCalcConfig002offbalanceprotype/InfoListAction/getDetail1', {
-      params:{offobjectNo},
+      params:{offobjectNo,offobjectStage},
     });
   }
 
@@ -100,9 +100,9 @@ export function getFunTree1() {
   }
 
 
-  export function rules_list(offobjectNo:any){
+  export function rules_list(offobjectNo:any,offobjectStage:any){
     return baseFun.request<rwaCalcConfOffbalanceprotyperuleModel[]>('/api/product/rwa/rwaCalcConfig002offbalanceprotype/InfoListAction/rules_list',{
-      params:{offobjectNo}
+      params:{offobjectNo,offobjectStage}
     })
   }
   

Procedure/frontend/projectb/src/services/rwa/product/dataquality/datascopemanage.ts

@@ -30,6 +30,7 @@ export type TableRelationDefineModel = {
     englishSourceTableNames : string;
     englishTargetTableNames : string;
     riskCategorys : string[];
+    sourceSystemS : string[];
   } & BasePageModel;
 
 

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

@@ -24,6 +24,8 @@ export type MeteringRuleModel = {
     defaultOut: string;   
     // 规则序号
     creditRiskIndex: string;
+
+    creditRiskBussinessCodes:string[];
   } & BasePageModel;