数据补录任务管理代码修改

Procedure/backend/project/src/main/java/com/sundata/product/rwa/datasupplementary/action/SupplementTaskManagementAction.java

@@ -11,8 +11,12 @@ import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.List;
+
 @RestController
 @RequestMapping("/product/rwa/datasupplementary/SupplementTaskManagementAction")
 public class SupplementTaskManagementAction extends BaseAction {
@@ -119,34 +123,6 @@ public class SupplementTaskManagementAction extends BaseAction {
         supplementTaskManagementService.deleteInfoData(model);
     }
 
-    /**
-     * @author: 张艳杰
-     * @methodsName: deleteTemplateListData
-     * @description: 删除补录模板列表当前行详细数据
-     * @param: HttpServletRequest request, HttpServletResponse response, @RequestBody SupplementTemplateRelationModel model
-     * @return: SupplementTemplateRelationModel
-     * @throws:
-     */
-    @RequestMapping({"deleteTemplateListData"})
-    public void deleteTemplateListData(HttpServletRequest request, HttpServletResponse response,
-                                             @RequestBody SupplementTemplateRelationModel model) {
-        supplementTaskManagementService.deleteTemplateListData(model);
-    }
-
-    /**
-     * @author: 张艳杰
-     * @methodsName: deleteTemplateCheckData
-     * @description: 删除补录模板校验规则数据列表
-     * @param: HttpServletRequest request, HttpServletResponse response, @RequestBody TemplateDataValidationRuleModel model
-     * @return: TemplateDataValidationRuleModel
-     * @throws:
-     */
-    @RequestMapping({"deleteTemplateCheckData"})
-    public void deleteTemplateCheckData(HttpServletRequest request, HttpServletResponse response,
-                                              @RequestBody TemplateDataValidationRuleModel model) {
-       supplementTaskManagementService.deleteTemplateCheckData(model);
-    }
-
     /**
      * @author: 张艳杰
      * @methodsName: updateRowData
@@ -213,8 +189,11 @@ public class SupplementTaskManagementAction extends BaseAction {
      */
     @RequestMapping({"createTemplateListRowData"})
     public void createTemplateListRowData(HttpServletRequest request, HttpServletResponse response,
-                                          @RequestBody SupplementTemplateRelationModel model) {
-       supplementTaskManagementService.createTemplateListRowData(model);
+                                          @RequestBody List<SupplementTemplateRelationModel> relationList,
+                                          @RequestParam String taskCode) {
+        //System.out.println(modelMap);
+        supplementTaskManagementService.createTemplateListRowData(relationList,taskCode);
+       //supplementTaskManagementService.createTemplateListRowData(modelList);
     }
 
     /**
@@ -227,8 +206,8 @@ public class SupplementTaskManagementAction extends BaseAction {
      */
     @RequestMapping({"createTemplateCheckRowData"})
     public void createTemplateCheckRowData(HttpServletRequest request, HttpServletResponse response,
-                                           @RequestBody TemplateDataValidationRuleModel model) {
-        supplementTaskManagementService.createTemplateCheckRowData(model);
+                                           @RequestBody List<TemplateDataValidationRuleModel> modelList) {
+        supplementTaskManagementService.createTemplateCheckRowData(modelList);
     }
 
 }

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

@@ -26,7 +26,7 @@ public interface SupplementTaskManagementMapper {
 
     public void deleteTemplateListData(@Param("model") SupplementTemplateRelationModel model);
 
-    public void deleteTemplateCheckData(@Param("model") TemplateDataValidationRuleModel model);
+    public void deleteTemplateCheckData(@Param("model") SupplementTemplateRelationModel model);
 
     public void updateRowData(@Param("model") SupplementTaskDefineModel model);
 

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

@@ -30,6 +30,8 @@ public class SupplementTaskDefineModel {
     private String stageinId;
     // 模板名称
     private String tmpNames;
+    // 状态
+    private String status;
 
     public String getCalcIndex() {
         return calcIndex;
@@ -142,4 +144,12 @@ public class SupplementTaskDefineModel {
     public void setTmpNames(String tmpNames) {
         this.tmpNames = tmpNames;
     }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

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

@@ -16,6 +16,8 @@ public class SupplementTemplateRelationModel {
     private String taskCode;
     // 补录模板编号
     private String tmpCode;
+    // 模板名称
+    private String tmpName;
     // 数据初始化逻辑
     private String sqlCode;
     // 补录模板说明
@@ -77,6 +79,14 @@ public class SupplementTemplateRelationModel {
         this.tmpCode = tmpCode;
     }
 
+    public String getTmpName() {
+        return tmpName;
+    }
+
+    public void setTmpName(String tmpName) {
+        this.tmpName = tmpName;
+    }
+
     public String getSqlCode() {
         return sqlCode;
     }

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

@@ -14,6 +14,8 @@ public class TemplateDataValidationRuleModel {
     private String dataDate;
     // 模板编号
     private String tmpCode;
+    // 模板名称
+    private String tmpName;
     // 规则编号
     private String tmpverificationCode;
     // 规则名称
@@ -87,6 +89,14 @@ public class TemplateDataValidationRuleModel {
         this.tmpCode = tmpCode;
     }
 
+    public String getTmpName() {
+        return tmpName;
+    }
+
+    public void setTmpName(String tmpName) {
+        this.tmpName = tmpName;
+    }
+
     public String getTmpverificationCode() {
         return tmpverificationCode;
     }

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

@@ -20,7 +20,11 @@
         ACCOUNT               AS   account,
         FREQUENCY             AS   frequency,
         ADJUSTMENT            AS   adjustment,
-        STAGEIN_ID            AS   stageinId
+        STAGEIN_ID            AS   stageinId,
+        CASE
+        WHEN STATUS = '0' THEN '失效'
+        WHEN STATUS = '1' THEN '生效'
+        END                   AS   status
         FROM RWA_IMPUT_SUPTASKCONF_BASEINFO
         <where>
             <if test="model.taskCode != null and model.taskCode !=''">
@@ -61,19 +65,22 @@
     <select id="getTemplateDataList"
             resultType="com.sundata.product.rwa.datasupplementary.model.SupplementTemplateRelationModel">
         SELECT
-        CALCINDEX              AS   calcIndex,
-        SDATE                  AS   startDate,
-        EDATE                  AS   endDate,
-        TERM                   AS   term,
-        DATA_DATE              AS   dataDate,
-        TASKCODE               AS   taskCode,
-        TMPCODE                AS   tmpCode,
-        SQLCODE                AS   sqlCode,
-        REMARK                 AS   remark
-        FROM RWA_IMPUT_SUPTASKCONF_RELATEDINFO
+        T1.CALCINDEX              AS   calcIndex,
+        T1.SDATE                  AS   startDate,
+        T1.EDATE                  AS   endDate,
+        T1.TERM                   AS   term,
+        T1.DATA_DATE              AS   dataDate,
+        T1.TASKCODE               AS   taskCode,
+        T1.TMPCODE                AS   tmpCode,
+        T2.TMPNAME                AS   tmpName,
+        T1.SQLCODE                AS   sqlCode,
+        T1.REMARK                 AS   remark
+        FROM RWA_IMPUT_SUPTASKCONF_RELATEDINFO T1
+        LEFT JOIN RWA_IMPUT_TMPCONF_BASEINFO T2
+        ON T1.TMPCODE = T2.TMPCODE
         <where>
             <if test="model.taskCode != null and model.taskCode !=''">
-                TASKCODE = #{model.taskCode}
+                T1.TASKCODE = #{model.taskCode}
             </if>
         </where>
     </select>
@@ -83,29 +90,32 @@
     <select id="getTemplateCheckDataList"
             resultType="com.sundata.product.rwa.datasupplementary.model.TemplateDataValidationRuleModel">
         SELECT
-        T2.CALCINDEX                    AS    calcIndex,
-        T2.SDATE                        AS    startDate,
-        T2.EDATE                        AS    endDate,
-        T2.TERM                         AS    term,
-        T2.DATA_DATE                    AS    dataDate,
-        T2.TMPCODE                      AS    tmpCode,
-        T2.TMPVERIFICATIONCODE          AS    tmpverificationCode,
-        T2.TMPVERIFICATIONNAME          AS    tmpverificationName,
-        T2.TMPVERROWCOLTYPE             AS    tmpverRowColType,
-        T2.VARTIMMER                    AS    vartimmer,
-        T2.TMPVERROWRANGE               AS    tmpverRowRange,
-        T2.TMPVERCOLUMNRANGE            AS    tmpverColumnRange,
-        T2.CHECKTYPE                    AS    checkType,
-        T2.EXCELFORMULA                 AS    excelFormula,
-        T2.SQLCODE                      AS    sqlCode,
-        T2.EXCEEDTYPE                   AS    exceedType,
-        T2.ERRORMSGTMPLATE              AS    errorMsgTmplate
-        FROM RWA_IMPUT_SUPTASKCONF_RELATEDINFO T1
-        LEFT JOIN RWA_IMPUT_TMPCONF_VERIFICATION_RULES T2
+        T1.CALCINDEX                    AS    calcIndex,
+        T1.SDATE                        AS    startDate,
+        T1.EDATE                        AS    endDate,
+        T1.TERM                         AS    term,
+        T1.DATA_DATE                    AS    dataDate,
+        T1.TMPCODE                      AS    tmpCode,
+        T1.TMPVERIFICATIONCODE          AS    tmpverificationCode,
+        T1.TMPVERIFICATIONNAME          AS    tmpverificationName,
+        T1.TMPVERROWCOLTYPE             AS    tmpverRowColType,
+        T1.VARTIMMER                    AS    vartimmer,
+        T1.TMPVERROWRANGE               AS    tmpverRowRange,
+        T1.TMPVERCOLUMNRANGE            AS    tmpverColumnRange,
+        T1.CHECKTYPE                    AS    checkType,
+        T1.EXCELFORMULA                 AS    excelFormula,
+        T1.SQLCODE                      AS    sqlCode,
+        T1.EXCEEDTYPE                   AS    exceedType,
+        T1.ERRORMSGTMPLATE              AS    errorMsgTmplate,
+        T3.TMPNAME                      AS    tmpName
+        FROM RWA_IMPUT_TMPCONF_VERIFICATION_RULES  T1
+        LEFT JOIN RWA_IMPUT_SUPTASKCONF_RELATEDINFO T2
         ON T1.TMPCODE = T2.TMPCODE
+        LEFT JOIN RWA_IMPUT_TMPCONF_BASEINFO T3
+        ON T2.TMPCODE = T3.TMPCODE
         <where>
             <if test="model.taskCode != null and model.taskCode !=''">
-                T1.TASKCODE = #{model.taskCode}
+                T2.TASKCODE = #{model.taskCode}
             </if>
         </where>
     </select>
@@ -127,10 +137,11 @@
         ACCOUNT,
         FREQUENCY,
         ADJUSTMENT,
-        STAGEIN_ID
+        STAGEIN_ID,
+        STATUS
         )
         values(
-        #{model.calcindex},
+        #{model.calcIndex},
         #{model.startDate},
         #{model.endDate},
         #{model.term},
@@ -142,14 +153,15 @@
         #{model.account},
         #{model.frequency},
         #{model.adjustment},
-        #{model.stageinId}
+        #{model.stageinId},
+        '1'
         )
     </insert>
 
 
     <!-- 报表的新增 -->
     <insert id="createTemplateListRowData">
-        insert into RWA_IMPUT_TMPCONF_FIELDDETAILS
+        insert into RWA_IMPUT_SUPTASKCONF_RELATEDINFO
         (CALCINDEX,
         SDATE,
         EDATE,
@@ -161,7 +173,7 @@
         REMARK
         )
         values(
-        #{model.calcindex},
+        #{model.calcIndex},
         #{model.startDate},
         #{model.endDate},
         #{model.term},
@@ -176,7 +188,7 @@
 
     <!-- 报表的新增 -->
     <insert id="createTemplateCheckRowData">
-        insert into RWA_IMPUT_TMPCONF_FIELDDETAILS
+        insert into RWA_IMPUT_TMPCONF_VERIFICATION_RULES
         (CALCINDEX,
         SDATE,
         EDATE,
@@ -196,7 +208,7 @@
         ERRORMSGTMPLATE
         )
         values(
-        #{model.calcindex},
+        #{model.calcIndex},
         #{model.startDate},
         #{model.endDate},
         #{model.term},
@@ -219,15 +231,11 @@
 
 
 
-
     <!-- 数据补录模板的更新 -->
     <update id="updateRowData">
-        update RWA_IMPUT_TMPCONF_BASEINFO
+        update RWA_IMPUT_SUPTASKCONF_BASEINFO
         <trim suffixOverrides=",">
             <set>
-                <if test="model.taskCode != null and model.taskCode != ''">
-                    TASKCODE = #{model.taskCode},
-                </if>
                 <if test="model.taskName != null and model.taskName != ''">
                     TASKNAME = #{model.taskName},
                 </if>
@@ -249,6 +257,7 @@
                 <if test="model.stageinId != null and model.stageinId != ''">
                     STAGEIN_ID = #{model.stageinId},
                 </if>
+                STATUS = '1'
             </set>
         </trim>
         <where>
@@ -339,42 +348,32 @@
         </where>
     </update>
 
+    <!-- 补录任务的的作废 -->
+    <update id="deleteInfoData">
+        update RWA_IMPUT_TMPCONF_BASEINFO
+        <set>
+            STATUS = '0'
+        </set>
+    </update>
 
 
-
-    <!-- 报表的删除 -->
-    <delete id="deleteInfoData">
-        delete from RWA_IMPUT_TMPCONF_BASEINFO
-        <where>
-            <if test="model.taskCode != null and model.taskCode !=''">
-                TASKCODE = #{model.taskCode}
-            </if>
-        </where>
-    </delete>
-
-    <!-- 报表的删除 -->
+    <!-- 补录模板列表的删除 -->
     <delete id="deleteTemplateListData">
-        delete from RWA_IMPUT_TMPCONF_BASEINFO
+        delete from RWA_IMPUT_SUPTASKCONF_RELATEDINFO
         <where>
             <if test="model.taskCode != null and model.taskCode !=''">
                 TASKCODE = #{model.taskCode}
             </if>
-            <if test="model.tmpCode != null and model.tmpCode !=''">
-                TMPCODE = #{model.tmpCode}
-            </if>
         </where>
     </delete>
 
-    <!-- 报表的删除 -->
+    <!-- 补录模板校验规则的删除 -->
     <delete id="deleteTemplateCheckData">
-        delete from RWA_IMPUT_TMPCONF_BASEINFO
+        delete from RWA_IMPUT_TMPCONF_VERIFICATION_RULES
         <where>
             <if test="model.tmpCode != null and model.tmpCode !=''">
                 TMPCODE = #{model.tmpCode}
             </if>
-            <if test="model.tmpverificationCode != null and model.tmpverificationCode !=''">
-                TMPVERIFICATIONCODE = #{model.tmpverificationCode}
-            </if>
         </where>
     </delete>
 
@@ -405,64 +404,4 @@
     </select>
 
 
-    <!-- 报表的初始化 -->
-    <select id="selectTemplateListDetailData"
-            resultType="com.sundata.product.rwa.datasupplementary.model.SupplementTemplateRelationModel">
-        SELECT
-        CALCINDEX              AS   calcIndex,
-        SDATE                  AS   startDate,
-        EDATE                  AS   endDate,
-        TERM                   AS   term,
-        DATA_DATE              AS   dataDate,
-        TASKCODE               AS   taskCode,
-        TMPCODE                AS   tmpCode,
-        SQLCODE                AS   sqlCode,
-        REMARK                 AS   remark
-        FROM RWA_IMPUT_SUPTASKCONF_RELATEDINFO
-        <where>
-            <if test="model.taskCode != null and model.taskCode !=''">
-                TASKCODE = #{model.taskCode}
-            </if>
-            <if test="model.tmpCode != null and model.tmpCode !=''">
-                and TMPCODE = #{model.tmpCode}
-            </if>
-        </where>
-    </select>
-
-
-    <!-- 报表的初始化 -->
-    <select id="selectTemplateCheckDetailData"
-            resultType="com.sundata.product.rwa.datasupplementary.model.TemplateDataValidationRuleModel">
-        SELECT
-        CALCINDEX                    AS    calcIndex,
-        SDATE                        AS    startDate,
-        EDATE                        AS    endDate,
-        TERM                         AS    term,
-        DATA_DATE                    AS    dataDate,
-        TMPCODE                      AS    tmpCode,
-        TMPVERIFICATIONCODE          AS    tmpverificationCode,
-        TMPVERIFICATIONNAME          AS    tmpverificationName,
-        TMPVERROWCOLTYPE             AS    tmpverRowColType,
-        VARTIMMER                    AS    vartimmer,
-        TMPVERROWRANGE               AS    tmpverRowRange,
-        TMPVERCOLUMNRANGE            AS    tmpverColumnRange,
-        CHECKTYPE                    AS    checkType,
-        EXCELFORMULA                 AS    excelFormula,
-        SQLCODE                      AS    sqlCode,
-        EXCEEDTYPE                   AS    exceedType,
-        ERRORMSGTMPLATE              AS    errorMsgTmplate
-        FROM RWA_IMPUT_TMPCONF_VERIFICATION_RULES
-        <where>
-            <if test="model.tmpCode != null and model.tmpCode !=''">
-                TMPCODE = #{model.tmpCode}
-            </if>
-            <if test="model.tmpverificationCode != null and model.tmpverificationCode !=''">
-                AND TMPVERIFICATIONCODE = #{model.tmpverificationCode}
-            </if>
-        </where>
-    </select>
-
-
-
-
 </mapper>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/datasupplementary/service/SupplementTaskManagementService.java

@@ -8,6 +8,8 @@ import com.sundata.product.rwa.datasupplementary.model.TemplateDataValidationRul
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -113,29 +115,6 @@ public class SupplementTaskManagementService {
         supplementTaskManagementMapper.deleteInfoData(model);
     }
 
-    /**
-     * @author: 张艳杰
-     * @methodsName: deleteTemplateListData
-     * @description: 删除补录模板列表当前行详细数据
-     * @param:   SupplementTemplateRelationModel model
-     * @return:
-     * @throws:
-     */
-    public void deleteTemplateListData(SupplementTemplateRelationModel model) {
-        supplementTaskManagementMapper.deleteTemplateListData(model);
-    }
-
-    /**
-     * @author: 张艳杰
-     * @methodsName: deleteTemplateCheckData
-     * @description: 删除补录模板校验规则数据列表
-     * @param:   TemplateDataValidationRuleModel model
-     * @return:
-     * @throws:
-     */
-    public void deleteTemplateCheckData(TemplateDataValidationRuleModel model) {
-        supplementTaskManagementMapper.deleteTemplateCheckData(model);
-    }
 
     /**
      * @author: 张艳杰
@@ -193,8 +172,15 @@ public class SupplementTaskManagementService {
      * @return:
      * @throws:
      */
-    public void createTemplateListRowData(SupplementTemplateRelationModel model) {
-        supplementTaskManagementMapper.createTemplateListRowData(model);
+    public void createTemplateListRowData(List<SupplementTemplateRelationModel> relationList,String taskCode) {
+
+        supplementTaskManagementMapper.deleteTemplateListData(relationList.get(0));
+        for (SupplementTemplateRelationModel relationModel:relationList) {
+            relationModel.setTaskCode(taskCode);
+            supplementTaskManagementMapper.deleteTemplateCheckData(relationModel);
+            supplementTaskManagementMapper.createTemplateListRowData(relationModel);
+        }
+
     }
 
     /**
@@ -205,7 +191,10 @@ public class SupplementTaskManagementService {
      * @return:
      * @throws:
      */
-    public void createTemplateCheckRowData(TemplateDataValidationRuleModel model) {
-        supplementTaskManagementMapper.createTemplateCheckRowData(model);
+    public void createTemplateCheckRowData(List<TemplateDataValidationRuleModel> modelList) {
+
+        for (TemplateDataValidationRuleModel model:modelList) {
+            supplementTaskManagementMapper.createTemplateCheckRowData(model);
+        }
     }
 }

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

@@ -2,13 +2,13 @@ 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  {Upload} from 'antd'
-import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDSubmitButton,EditType, SDAreaTtile, SDOperate, baseFun,SDModal, validateFun, SDLayout, } from "@sundata/ui-frame";
-import type { SupplementTaskDefineModel,SupplementTemplateRelationModel,TemplateDataValidationRuleModel } from '@/services/rwa/product/datasupplementary/supplementtaskmanagement';
-import {getDataList,selectDetailData,getTemplateCheckDataList,getTemplateDataList,deleteInfoData,deleteTemplateListData,deleteTemplateCheckData,
-  updateRowData,createRowData,createTemplateListRowData,createTemplateCheckRowData,selectTemplateListDetailData,selectTemplateCheckDetailData
-} from '@/services/rwa/product/datasupplementary/supplementtaskmanagement';
+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';
+import {getDataList,selectDetailData,getTemplateCheckDataList,getTemplateDataList,deleteInfoData,updateRowData,
+  createRowData,createTemplateListRowData,createTemplateCheckRowData} from '@/services/rwa/product/datasupplementary/supplementtaskmanagement';
 import { PlusSquareTwoTone, WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
+import { toNumber } from "lodash";
 
 type widowRush = {
   onCancel:  () => void;
@@ -21,8 +21,6 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
     const [editType, setEditType] = useState<EditType>(prop.editType || 'display');
     /** 是否显示详细信息窗口 */
     const [detailVisible, setDetailVisible] = useState<boolean>(false);
-    const [templateListVisible, setTemplateListVisible] = useState<boolean>(false);
-    const [templateCheckVisible, setTemplateCheckVisible] = useState<boolean>(false);
 
     const [currentRow, setCurrentRow] = useState<SupplementTaskDefineModel>();
     /** 表格引用对象，刷新表格使用   */
@@ -30,15 +28,19 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
     const formRef = useRef<FormInstance<any>>();
     const templateListRef = useRef<FormInstance<any>>();
     const templateCheckRef = useRef<FormInstance<any>>();
+    const templateListActionRef = useRef<ActionType>();
+    const templateCheckActionRef = useRef<ActionType>();
 
     const [templateListData, setTemplateListData] = useState<SupplementTemplateRelationModel[]>();
     const [templateCheckData, setTemplateCheckData] = useState<TemplateDataValidationRuleModel[]>();
+    // const [resMap, setResMap] = useState<ModelMap>();
 
     // 页面数据
     var formDataList = new Array<SupplementTaskDefineModel>;
 
     /** 字段关系序号编辑 */
-    var dataIndex = 1;
+    var dataInfoIndex = 1;
+    var dataDetailIndex = 0;
 
     useEffect(() => {
       }, []);
@@ -49,23 +51,11 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
       const data = await selectDetailData(formdata);
       formRef.current?.setFieldsValue(data);
       const dataList = await getTemplateDataList(formdata);
-      setTemplateListData(dataList);
+      setTemplateListData(...[dataList]);
       const templateList = await getTemplateCheckDataList(formdata);
-      setTemplateCheckData(templateList);
+      setTemplateCheckData(...[templateList]);
      }
 
-    // 修改
-    const selectTemplateRelation =async (formdata :SupplementTemplateRelationModel)=>{
-      const data = await selectTemplateListDetailData(formdata);
-      templateListRef.current?.setFieldsValue(data);
-    }
-
-    // 修改
-    const selectTemplateCheck = async(formdata :TemplateDataValidationRuleModel)=>{
-      const data = await selectTemplateCheckDetailData(formdata);
-      templateCheckRef.current?.setFieldsValue(data);
-    }
-
      // 删除
     const deleteData = async(formdata : SupplementTaskDefineModel) => {
       baseFun.confirm('请确认是否继续操作？',async() =>{
@@ -75,54 +65,31 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
        });
     }
 
-     // 删除
-     const deleteListData = async(formdata : SupplementTemplateRelationModel) => {
-        baseFun.confirm('请确认是否继续操作？',async() =>{
-          await deleteTemplateListData(formdata);
-          baseFun.info("删除成功");
-          closeAndRefresh();
-         });
-      }
-
-
-     // 删除
-     const deletecheckData = async(formdata : TemplateDataValidationRuleModel) => {
-        baseFun.confirm('请确认是否继续操作？',async() =>{
-          await deleteTemplateCheckData(formdata);
-          baseFun.info("删除成功");
-          closeAndRefresh();
-         });
-      }
-
 
 
     // 插入或者更新数据
   const handleSave = async(data: SupplementTaskDefineModel,) => {
     
     if (editType == 'update' ) {
-       await updateRowData(data);
+       await updateRowData(data).then(()=>{
+        if (templateListData && templateCheckData) {
+          createTemplateListRowData(templateListData,data.taskCode);
+          createTemplateCheckRowData(templateCheckData);
+        }
+       });
        closeAndRefresh();
     } else if (editType == 'create' ) {
-      await createRowData(data);
+      await createRowData(data).then(()=>{
+        if (templateListData && templateCheckData) {
+          createTemplateListRowData(templateListData,data.taskCode);
+          createTemplateCheckRowData(templateCheckData);
+        }
+      });
       closeAndRefresh();
     }
     setDetailVisible(false);
   }
 
-    // 插入或者更新数据
-    const handleTemplateRelationSave = async(data: SupplementTemplateRelationModel) => {
-      await createTemplateListRowData(data);
-      closeAndRefresh();
-      setTemplateListVisible(false);
-    }
-
-
-    // 插入或者更新数据
-    const handleTemplateRuleSave = async(data: TemplateDataValidationRuleModel) => {
-      await createTemplateCheckRowData(data);
-      closeAndRefresh();
-      setTemplateListVisible(false);
-    }
 
     //关闭窗口刷新父页面
     const closeAndRefresh = ()=>{
@@ -137,7 +104,7 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
           title: '序号',
           dataIndex: 'index',
           search: false,
-          render: (text, record, index) => { index  = index + 1;dataIndex = index; return index},
+          render: (text, record, index) => { index  = index + 1;return index},
           width:100,
           ellipsis:true
         },
@@ -204,6 +171,12 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
           hideInTable: false,
           search: false,
         },
+        {
+          title: '状态', 
+          dataIndex: 'status',
+          hideInTable: false,
+          search: false,
+        },
         {
           title: '操作',
           dataIndex: 'operate',
@@ -257,11 +230,12 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
        const templateListColumns: ProColumns<SupplementTemplateRelationModel>[] = [
         {
           title: '序号',
-          dataIndex: 'index',
+          dataIndex: 'id',
           search: false,
-          render: (text, record, index) => { index  = index + 1; return index},
+          render: (text, record, index) => { index  = index + 1;dataInfoIndex = index; return index},
           width:100,
-          ellipsis:true
+          ellipsis:true,
+          editable:false
         },
           {
             title: '计算实例号',
@@ -292,6 +266,10 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             dataIndex: 'tmpCode',
             search: false,
             hideInTable: false,
+            formItemProps:{
+              rules:[
+                {required:true},]
+            }
           },
           {
             title: '补录模板说明',
@@ -315,27 +293,11 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                 icon={<WomanOutlined />}
                 successMessage=""
                 onClick={async ()=>{ 
-                  //selectData(record);
-                  selectTemplateRelation(record);
-                  setTemplateListVisible(true);
-                  setEditType('update');
+                  templateListActionRef.current?.startEditable(record.tmpCode);
                  } }
               >
-                修改
+                编辑
               </SDOperate>,
-              <SDOperate
-              key="roleCfg"
-              icon={<WomanOutlined />}
-              successMessage=""
-              onClick={
-                ()=>{ 
-                deleteListData(record);
-                setDetailVisible(true);
-                setEditType('update');
-               } }
-            >
-              删除
-            </SDOperate>,
             ],
           },
         ];
@@ -345,11 +307,12 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
        const templateCheckColumns: ProColumns<TemplateDataValidationRuleModel>[] = [
         {
           title: '序号',
-          dataIndex: 'index',
+          dataIndex: 'id',
           search: false,
-          render: (text, record, index) => { index  = index + 1; return index},
+          render: (text, record, index) => { index  = index + 1;dataDetailIndex =index; return index},
           width:100,
-          ellipsis:true
+          ellipsis:true,
+          editable:false
         },
           {
             title: '计算实例号',
@@ -416,7 +379,11 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
             dataIndex: 'tmpverRowRange',
             hideInTable: false,
             width:150,
-          ellipsis:true
+            ellipsis:true,
+            formItemProps:{
+              rules:[
+                {pattern: RegExp(`[0-9]+\\-[0-9]+|[n|N]`),message:'请输入正确范围'},]
+            }
           },
           {
             title: '列范围', 
@@ -480,27 +447,11 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
                 successMessage=""
                 onClick={
                   async()=>{ 
-                  //selectData(record);
-                  selectTemplateCheck(record);
-                  setTemplateCheckVisible(true);
-                  setEditType('update');
-                 } }
+                  templateCheckActionRef.current?.startEditable(record.tmpverificationCode);
+                 }}
               >
-                修改
+                编辑
               </SDOperate>,
-              <SDOperate
-              key="roleCfg"
-              icon={<WomanOutlined/>}
-              successMessage=""
-              onClick={
-                ()=>{ 
-                deletecheckData(record);
-                setDetailVisible(true);
-                setEditType('update');
-               } }
-            >
-              删除
-            </SDOperate>,
             ],
           },
         ];
@@ -560,112 +511,81 @@ const supplementtaskmanagement : React.FC<widowRush> = (prop:widowRush) => {
         >
             <SDAreaTtile title='补录任务新增页面'/>
             <SDFormText name="taskCode"      readonlyCond="update" required={true} label="任务编号"/>
-            <SDFormText name="tmpName"      label="任务名称"/>
-            <SDFormText name="orgCode"      label="责任机构"/>
-            <SDFormText name="account"     label="首选责任人"/>
-            <SDFormText name="frequency"  label="补录频率"/>
+            <SDFormText name="taskName"      label="任务名称"/>
+            <SDFormDict dictKey=""  name="orgCode"      label="责任机构"/>
+            <SDFormDict dictKey="" name="account"     label="首选责任人"/>
+            <SDFormDict dictKey="CALC_TASK_RATE" name="frequency"  label="补录频率"/>
             <SDFormText name="adjustment"  label="天数调整"/>
-            <SDFormText name="tmpFileCode"  label="所属阶段"/>
+            <SDFormDict dictKey="" name="tmpFileCode"  label="所属阶段"/>
         <SDLayout>
         <SDAreaTtile title='补录模板列表'/>
-        <ProTable
-          search={false}
-          rowKey="index"
-          columns={templateListColumns}
-          dataSource={templateListData}
-          toolBarRender={(_, { selectedRowKeys }) => editType == 'create' || editType == 'update' ? [
-            <SDButton
-              key="export"
-              successMessage=''
-              onClick={() => {
-                setTemplateListVisible(true);
+        <EditableProTable
+              rowKey="tmpCode"
+              columns={templateListColumns}
+              recordCreatorProps={false}
+              actionRef={templateListActionRef}
+              value={templateListData}
+              editable={{
+                actionRender: (row,config,defaultDoms)=>{
+                  return [defaultDoms.save,defaultDoms.delete,defaultDoms.cancel]
+                }
               }}
-            >
-              新增
-            </SDButton>,
-          ]:[]}
-        />
+              toolBarRender={(_, { selectedRowKeys }) => editType == 'create' || editType == 'update' ? [
+                <SDButton
+                  key="export"
+                  successMessage=''
+                  onClick={() => {
+                    templateListActionRef.current?.addEditRecord?.({
+                      tmpCode: dataInfoIndex+1,
+                      title: 'NEWROW',
+                    });
+                  }}
+                >
+                  新增
+                </SDButton>,
+              ]:[]}
+              onChange={ (value: readonly SupplementTemplateRelationModel[]) => {
+                setTemplateListData([...value]);
+              } }
+           />
         </SDLayout>
 
         <SDLayout>
         <SDAreaTtile title='补录模板校验规则'/>
-        <ProTable
-          search={false}
-          rowKey="index"
-          columns={templateCheckColumns}
-          dataSource={templateCheckData}
-          scroll={{ x: 1500 }}
-          toolBarRender={(_, { selectedRowKeys }) => editType == 'create' || editType == 'update' ? [
-            <SDButton
-              key="export"
-              successMessage=''
-              onClick={() => {
-                setTemplateCheckVisible(true);
+        <EditableProTable
+              rowKey="tmpverificationCode"
+              columns={templateCheckColumns}
+              recordCreatorProps={false}
+              actionRef={templateCheckActionRef}
+              scroll={{ x: 1500 }}
+              value={templateCheckData}
+              editable={{
+                actionRender: (row,config,defaultDoms)=>{
+                  return [defaultDoms.save,defaultDoms.delete,defaultDoms.cancel]
+                }
               }}
-            >
-              新增
-            </SDButton>,
-          ]:[]}
-        />
+              toolBarRender={(_, { selectedRowKeys }) => editType == 'create' || editType == 'update' ? [
+                <SDButton
+                  key="export"
+                  successMessage=''
+                  onClick={() => {
+                    templateCheckActionRef.current?.addEditRecord?.({
+                      tmpverificationCode: dataDetailIndex+1,
+                      title: 'NEWROW',
+                    });
+                  }}
+                >
+                  新增
+                </SDButton>,
+              ]:[]}
+              onChange={ (value: readonly TemplateDataValidationRuleModel[]) => {
+                setTemplateCheckData([...value]);
+              } }
+           />
         </SDLayout>
         </SDModalForm>
       )}
 
-      {templateListVisible && (
-        <SDModalForm
-        visible={templateListVisible}
-        onVisibleChange={() => {setTemplateListVisible(false)}}
-        formRef={templateListRef}
-        footer={[
-          <SDSubmitButton  editType={editType}   formRef={formRef} doSubmit={handleTemplateRelationSave} >保存</SDSubmitButton>,
-          <SDButton
-            key="closeUpdate"
-            successMessage=''
-            onClick={() => {
-                setTemplateListVisible(false);
-            }}>关闭</SDButton>
-          ]}
-        >
-         <SDFormText name="tmpCode"       label="补录模板"/>
-         <SDFormText name="remark"       label="补录模板说明"/>
-         <SDFormText name="sqlCode"      label="数据初始化逻辑"/>
-         <SDFormText name="columnRange"   label="字段类型与长度"/>
-         <SDFormText name="tmpFileCode"   label="数据项说明"/>
-        </SDModalForm>
-      )
-      }
-
-       {templateCheckVisible && (
-        <SDModalForm
-        visible={templateCheckVisible}
-        onVisibleChange={() => {setTemplateCheckVisible(false)}}
-        formRef={templateCheckRef}
-        footer={[
-          <SDSubmitButton  editType={editType}   formRef={formRef} doSubmit={handleTemplateRuleSave} >保存</SDSubmitButton>,
-          <SDButton
-            key="closeUpdate"
-            successMessage=''
-            onClick={() => {
-                setTemplateCheckVisible(false);
-            }}>关闭</SDButton>
-          ]}
-        >
-         <SDFormText name="tmpverificationName"       label="规则名称"/>
-         <SDFormText name="tmpCode"       label="补录模板"/>
-         <SDFormText name="tmpverRowColType"      label="行列类型"/>
-         <SDFormText name="vartimmer"   label="模板验证时点"/>
-         <SDFormText name="tmpverRowRange"   label="行范围"/>
-         <SDFormText name="tmpverColumnRange"   label="列范围"/>
-         <SDFormText name="checkType"   label="约束方式"/>
-         <SDFormText name="dataType"   label="数据类型"/>
-         <SDFormText name="sqlCode"       label="约束规则SQL"/>
-         <SDFormText name="exceedType"        label="越界处理方式"/>
-         <SDFormText name="errorMsgTmplate"   label="提示信息模板"/>
-         <SDFormText name="excelFormula"   label="约束公式"/>
-        </SDModalForm>
-      )
-      }
-
 
         </SDPage>
         

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

@@ -31,6 +31,8 @@ export type SupplementTaskDefineModel = {
     stageinId: string;
     // 模板名称
     tmpNames: string;
+    // 状态
+    status: string;
   } & BasePageModel;
 
 
@@ -54,6 +56,8 @@ export type SupplementTaskDefineModel = {
     sqlCode: string;
     // 补录模板说明
     remark: string;
+    // 模板名称
+    tmpName: string;
   } & BasePageModel;
 
 
@@ -72,6 +76,8 @@ export type TemplateDataValidationRuleModel = {
     dataDate: string;
     // 模板编号
     tmpCode: string;
+    // 模板名称
+    tmpName: string;
     // 规则编号
     tmpverificationCode: string;
     // 规则名称
@@ -99,7 +105,6 @@ export type TemplateDataValidationRuleModel = {
 } & BasePageModel;
 
 
-
 /** 获取页面初始化及条件查询 POST*/
 export async function getDataList(body:SupplementTaskDefineModel) {
     return baseFun.request<SupplementTaskDefineModel[]>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/getDataList.do',{data: body});
@@ -123,32 +128,12 @@ export async function selectDetailData(body:SupplementTaskDefineModel) {
     return baseFun.request<SupplementTaskDefineModel>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/selectDetailData.do',{data: body});
 }
 
-/** 获取页面初始化及条件查询 POST*/
-export async function selectTemplateListDetailData(body:SupplementTemplateRelationModel) {
-    return baseFun.request<SupplementTemplateRelationModel>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/selectTemplateListDetailData.do',{data: body});
-}
-
-/** 获取页面初始化及条件查询 POST*/
-export async function selectTemplateCheckDetailData(body:TemplateDataValidationRuleModel) {
-    return baseFun.request<TemplateDataValidationRuleModel>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/selectTemplateCheckDetailData.do',{data: body});
-}
-
 
 /** 获取页面初始化及条件查询 POST*/
 export async function deleteInfoData(body:SupplementTaskDefineModel) {
   return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/deleteInfoData.do',{data: body});
 }
 
-/** 获取页面初始化及条件查询 POST*/
-export async function deleteTemplateListData(body:SupplementTemplateRelationModel) {
-    return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/deleteTemplateListData.do',{data: body});
-  }
-
-/** 获取页面初始化及条件查询 POST*/
-export async function deleteTemplateCheckData(body:TemplateDataValidationRuleModel) {
-    return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/deleteTemplateCheckData.do',{data: body});
-  }
-
 
 /** 获取页面初始化及条件查询 POST*/
 export async function updateRowData(body:SupplementTaskDefineModel) {
@@ -156,18 +141,6 @@ export async function updateRowData(body:SupplementTaskDefineModel) {
 }
 
 
-/** 获取页面初始化及条件查询 POST*/
-export async function updateTemplateListRowData(body:SupplementTemplateRelationModel) {
-  return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/updateTemplateListRowData.do',{data: body});
-}
-
-
-/** 获取页面初始化及条件查询 POST*/
-export async function updateTemplateCheckRowData(body:TemplateDataValidationRuleModel) {
-    return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/updateTemplateCheckRowData.do',{data: body});
-  }
-
-
 /** 获取页面初始化及条件查询 POST*/
 export async function createRowData(body:SupplementTaskDefineModel) {
   return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/createRowData.do',{data: body});
@@ -175,13 +148,15 @@ export async function createRowData(body:SupplementTaskDefineModel) {
 
 
 /** 获取页面初始化及条件查询 POST*/
-export async function createTemplateListRowData(body:SupplementTemplateRelationModel) {
-  return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/createTemplateListRowData.do',{data: body});
+export async function createTemplateListRowData(body:SupplementTemplateRelationModel[],taskCode:string) {
+  return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/createTemplateListRowData.do',{data: body,
+    params:{taskCode}
+  });
 }
 
 
 /** 获取页面初始化及条件查询 POST*/
-export async function createTemplateCheckRowData(body:TemplateDataValidationRuleModel) {
+export async function createTemplateCheckRowData(body:TemplateDataValidationRuleModel[]) {
     return baseFun.request<void>('/api/product/rwa/datasupplementary/SupplementTaskManagementAction/createTemplateCheckRowData.do',{data: body});
 }