合格缓释定义参数修正

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig003regularrrcsrule/model/ReleaseToolRuleModel.java

@@ -25,6 +25,8 @@ public class ReleaseToolRuleModel {
     private String detailRuleIndex;
     // 合格缓释认定规则
     private String detailRuleGetData;
+    // 豁免规则
+    private String exemptionRules;
 
     public String getCalcIndex() {
         return calcIndex;
@@ -121,4 +123,12 @@ public class ReleaseToolRuleModel {
     public void setDetailRuleGetData(String detailRuleGetData) {
         this.detailRuleGetData = detailRuleGetData;
     }
+
+    public String getExemptionRules() {
+        return exemptionRules;
+    }
+
+    public void setExemptionRules(String exemptionRules) {
+        this.exemptionRules = exemptionRules;
+    }
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig003regularrrcsrule/model/ReleaseToolTypeModel.java

@@ -19,6 +19,10 @@ public class ReleaseToolTypeModel {
     private String regularRrcsRuleOut;
     // 所属阶段
     private String regularRrcsRuleStageId;
+    // 基础权重
+    private String baseWeight;
+    // 豁免后权重
+    private String exemptionWeight;
     // 认定顺序号
     private String regularRrcsRuleIndex;
     // 状态
@@ -96,6 +100,22 @@ public class ReleaseToolTypeModel {
         this.regularRrcsRuleStageId = regularRrcsRuleStageId;
     }
 
+    public String getBaseWeight() {
+        return baseWeight;
+    }
+
+    public void setBaseWeight(String baseWeight) {
+        this.baseWeight = baseWeight;
+    }
+
+    public String getExemptionWeight() {
+        return exemptionWeight;
+    }
+
+    public void setExemptionWeight(String exemptionWeight) {
+        this.exemptionWeight = exemptionWeight;
+    }
+
     public String getRegularRrcsRuleIndex() {
         return regularRrcsRuleIndex;
     }

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

@@ -16,6 +16,8 @@
         REGULARRRCSRULE_NAME	     AS regularRrcsRuleName,
         REGULARRRCSRULE_OUT          AS regularRrcsRuleOut,
         REGULARRRCSRULE_STAGE_ID     AS regularRrcsRuleStageId,
+        BASE_WEIGHT*100              AS baseWeight,
+        EXEMPTION_WEIGHT*100         AS exemptionWeight,
         REGULARRRCSRULE_INDEX        AS regularRrcsRuleIndex,
         CASE
         WHEN REGULARRRCSRULE_STATE = '1' THEN '生效'
@@ -47,6 +49,8 @@
         REGULARRRCSRULE_NAME,
         REGULARRRCSRULE_OUT,
         REGULARRRCSRULE_STAGE_ID,
+        BASE_WEIGHT,
+        EXEMPTION_WEIGHT,
         REGULARRRCSRULE_INDEX,
         REGULARRRCSRULE_STATE
         )
@@ -60,6 +64,8 @@
         #{model.regularRrcsRuleName},
         #{model.regularRrcsRuleOut},
         #{model.regularRrcsRuleStageId},
+        #{model.baseWeight}*0.01,
+        #{model.exemptionWeight}*0.01,
         #{model.regularRrcsRuleIndex},
         '1'
         )
@@ -85,6 +91,12 @@
                 <if test="model.regularRrcsRuleStageId != null and model.regularRrcsRuleStageId != ''">
                     REGULARRRCSRULE_STAGE_ID = #{model.regularRrcsRuleStageId},
                 </if>
+                <if test="model.baseWeight != null and model.baseWeight != ''">
+                    BASE_WEIGHT = #{model.baseWeight},
+                </if>
+                <if test="model.exemptionWeight != null and model.exemptionWeight != ''">
+                    EXEMPTION_WEIGHT = #{model.exemptionWeight},
+                </if>
                 REGULARRRCSRULE_STATE = '1',
             </set>
         </trim>
@@ -117,6 +129,8 @@
         REGULARRRCSRULE_NAME	     AS regularRrcsRuleName,
         REGULARRRCSRULE_OUT          AS regularRrcsRuleOut,
         REGULARRRCSRULE_STAGE_ID     AS regularRrcsRuleStageId,
+        BASE_WEIGHT                  AS baseWeight,
+        EXEMPTION_WEIGHT             AS exemptionWeight,
         REGULARRRCSRULE_INDEX        AS regularRrcsRuleIndex,
         CASE
         WHEN REGULARRRCSRULE_STATE = '1' THEN '生效'
@@ -161,7 +175,8 @@
         DETAILRULE_DATAIN	             AS  detailRuleDataIn,
         DETAILRULE_DATAOUT               AS  detailRuleDataOut,
         DETAILRULE_INDEX                 AS  detailRuleIndex,
-        DETAILRULE_GETDATA               AS  detailRuleGetData
+        DETAILRULE_GETDATA               AS  detailRuleGetData,
+        EXEMPTION_RULES                  AS  exemptionRules
         FROM RWA_CALC_CONF_REGULARRRCSRULEDETAIL
         <where>
             <if test="model.detailRuleRegularRrcsRuleOut != null and model.detailRuleRegularRrcsRuleOut !=''">
@@ -184,7 +199,8 @@
         DETAILRULE_DATAIN,
         DETAILRULE_DATAOUT,
         DETAILRULE_INDEX,
-        DETAILRULE_GETDATA
+        DETAILRULE_GETDATA,
+        EXEMPTION_RULES
         )
         values(
         #{model.calcIndex},
@@ -198,7 +214,8 @@
         #{model.detailRuleDataIn},
         #{model.detailRuleDataOut},
         #{model.detailRuleIndex},
-        #{model.detailRuleGetData}
+        #{model.detailRuleGetData},
+        #{model.exemptionRules}
         )
     </insert>
 
@@ -228,6 +245,9 @@
                 <if test="model.detailRuleGetData != null and model.detailRuleGetData != ''">
                     DETAILRULE_GETDATA = #{model.detailRuleGetData},
                 </if>
+                <if test="model.exemptionRules != null and model.exemptionRules != ''">
+                    EXEMPTION_RULES = #{model.exemptionRules},
+                </if>
             </set>
         </trim>
         <where>
@@ -258,7 +278,8 @@
         DETAILRULE_DATAIN	             AS  detailRuleDataIn,
         DETAILRULE_DATAOUT               AS  detailRuleDataOut,
         DETAILRULE_INDEX                 AS  detailRuleIndex,
-        DETAILRULE_GETDATA               AS  detailRuleGetData
+        DETAILRULE_GETDATA               AS  detailRuleGetData,
+        EXEMPTION_RULES                  AS  exemptionRules
         FROM RWA_CALC_CONF_REGULARRRCSRULEDETAIL
         <where>
             <if test="model.detailRuleNo != null and model.detailRuleNo !=''">
@@ -282,6 +303,9 @@
             <if test="model.detailRuleGetData != null and model.detailRuleGetData !=''">
                 and DETAILRULE_GETDATA = #{model.detailRuleGetData}
             </if>
+            <if test="model.exemptionRules != null and model.exemptionRules !=''">
+                and EXEMPTION_RULES = #{model.exemptionRules}
+            </if>
         </where>
     </select>
 

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

@@ -367,6 +367,12 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
           search:false,
           hideInTable: false,
         },
+        {
+          title: '豁免规则', 
+          dataIndex: 'exemptionRules',
+          search:false,
+          hideInTable: false,
+        },
         editType == 'update' || editType == 'create'? {
           title: '操作',
           dataIndex: 'operate',
@@ -471,6 +477,8 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
             <SDFormText name="regularRrcsRuleName" label="缓释工具类型名称"/>
             <SDFormDict name="regularRrcsRuleOut" dictKey='CUST_TYPE_LV02'  label="默认输出数据源" />
             <SDFormDict name="regularRrcsRuleStageId" dictKey='CUST_TYPE_LV02' label="所属阶段"/>
+            <SDFormText name="baseWeight" label="基础权重(%)"/>
+            <SDFormText name="exemptionWeight" label="豁免后权重(%)"/>
             <SDFormText name="regularRrcsRuleIndex" label="认定顺序号"/>
              <SDLayout>
             <SDAreaTtile title='合格缓释认定规则'/>
@@ -526,7 +534,7 @@ const releasetoolinfo : React.FC<widowProps> = (prop:widowProps) => {
             <SDFormDict name="detailRuleDataOut" dictKey='CUST_TYPE_LV02' label="输出数据源"/>
             <SDFormText name="detailRuleIndex" label="执行序号"/>
             <SDFormText type="textarea" name="detailRuleGetData" label="合格缓释认定规则"/>
-
+            <SDFormText type="textarea" name="exemptionRules" label="豁免规则"/>
             </SDModalForm>
         )}
 

Procedure/frontend/projectb/src/services/rwa/rwa_calc_config_003regularrrcsrule/releasetoolinfo.ts

@@ -21,6 +21,10 @@ export type ReleaseToolTypeModel = {
     regularRrcsRuleOut?: string;
     // 所属阶段
     regularRrcsRuleStageId?: string;
+    // 基础权重
+    baseWeight?: string;
+    // 豁免后权重
+    exemptionWeight?: string;
     // 认定顺序号
     regularRrcsRuleIndex?: string;
     // 状态
@@ -53,6 +57,8 @@ export type ReleaseToolTypeModel = {
     detailRuleIndex?: string;
     // 合格缓释认定规则
     detailRuleGetData?: string;
+    // 豁免规则
+    exemptionRules?: string;
   } & BasePageModel;