签章调整为允许修改签字注师

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -1,6 +1,7 @@
 package com.jeeplus.test.cw.projectReport.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.aop.logging.annotation.ApiLog;
@@ -288,6 +289,14 @@ public class CwProjectReportController {
     @ApiLog(value = "签章流程送审", type = LogTypeEnum.SAVE)
     @PostMapping("saveData")
     public ResponseEntity<String> saveData(@Valid @RequestBody CwProjectReportData cwProjectReportData) {
+        if (StringUtils.isNotBlank(cwProjectReportData.getSignatureAnnotator1()) && StringUtils.isNotBlank(cwProjectReportData.getSignatureAnnotator2())) {
+            // 修改报告表的 “签字注师1” 和 “签字注师2”
+            CwProjectReport cwProjectReport = new CwProjectReport();
+            cwProjectReport.setSignatureAnnotator1(cwProjectReportData.getSignatureAnnotator1());
+            cwProjectReport.setSignatureAnnotator2(cwProjectReportData.getSignatureAnnotator2());
+            cwProjectReport.setId(cwProjectReportData.getId());
+            projectReportService.updateAnnotatorById(cwProjectReport);
+        }
         if ("3".equals(cwProjectReportData.getSignatureType())) {
             // 实体公章流程
             String signatureId = projectReportService.getSignature(cwProjectReportData);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -170,4 +170,10 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @return
      */
     int checkIsSign(@Param("id")String id);
+
+    /**
+     * 根据报告id修改签字注师1、2的值
+     * @param cwProjectReport
+     */
+    void updateAnnotatorById(@Param("report")CwProjectReport cwProjectReport);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -508,4 +508,10 @@
         select count(id)
         from cw_project_report_file where report_file_id = #{id} and file_affiliation = 1
     </select>
+
+    <update id="updateAnnotatorById" parameterType="com.jeeplus.test.cw.projectReport.domain.CwProjectReport">
+        update cw_project_report
+        set signature_annotator1 = #{report.signatureAnnotator1},signature_annotator2 = #{report.signatureAnnotator2}
+        where id = #{report.id}
+    </update>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -2696,4 +2696,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         // 5. 根据报告id删除报告归档信息  // 逻辑删除
         cwProjectReportArchiveMapper.delete(new LambdaQueryWrapper<CwProjectReportArchive>().eq(CwProjectReportArchive::getReportId, reportId));
     }
+
+    /**
+     * 根据报告id修改签字注师1、2的值
+     * @param cwProjectReport
+     */
+    public void updateAnnotatorById(CwProjectReport cwProjectReport) {
+        reportMapper.updateAnnotatorById(cwProjectReport);
+    }
 }