公章+执业章流程

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportSignatureCallBackController.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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -90,6 +91,7 @@ public class CwProjectReportSignatureCallBackController {
         }
         // 流程节点审核通过
         flowTaskService.auditSave(flow, vars);
+        CwProjectReport cwProjectReport = cwProjectReportService.list(new QueryWrapper<CwProjectReport>().lambda().eq(CwProjectReport::getSignatureContractId, presignCallBack.getContractId())).get(0);
         // 指定下一步处理人
         Task task = taskService.createTaskQuery().processInstanceId(flow.getProcInsId()).active().singleResult();
         // task为null时，则当前节点为最后一个审核节点
@@ -97,11 +99,22 @@ public class CwProjectReportSignatureCallBackController {
             if(StringUtils.isNotBlank(flow.getAssignee ())){
                 taskService.setAssignee(task.getId(), flow.getAssignee ());
             }
+            if(ObjectUtil.isNotEmpty(cwProjectReport)) {
+                CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.selectOne(new QueryWrapper<CwProjectReportSignature>().lambda()
+                        .eq(CwProjectReportSignature::getReportId, cwProjectReport.getId())
+                        .eq(CwProjectReportSignature::getType, cwProjectReport.getSignatureType())
+                );
+                if ("2".equals(cwProjectReportSignature.getStatus())){
+                    cwProjectReportSignature.setStatus("6");
+                    cwProjectReportSignatureMapper.updateById(cwProjectReportSignature);
+                }else if ("6".equals(cwProjectReportSignature.getStatus())){
+                    cwProjectReportSignature.setStatus("7");
+                    cwProjectReportSignatureMapper.updateById(cwProjectReportSignature);
+                }
+            }
         } else {
             // 修改数据流程状态为->审核通过
-            List<CwProjectReport> list = cwProjectReportService.list(new QueryWrapper<CwProjectReport>().lambda().eq(CwProjectReport::getSignatureContractId, presignCallBack.getContractId()));
-            if (CollectionUtil.isNotEmpty(list)){
-                CwProjectReport cwProjectReport = list.get(0);
+            if(ObjectUtil.isNotEmpty(cwProjectReport)) {
                 CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.selectOne(new QueryWrapper<CwProjectReportSignature>().lambda()
                         .eq(CwProjectReportSignature::getReportId, cwProjectReport.getId())
                         .eq(CwProjectReportSignature::getType, cwProjectReport.getSignatureType())

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

@@ -1028,6 +1028,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         // 流程节点审核通过
         flowTaskService.auditSave(flow, vars);
+        CwProjectReport report = this.getOne(new QueryWrapper<CwProjectReport>().lambda().eq(CwProjectReport::getId, cwProjectReportData.getId()));
         // 指定下一步处理人
         Task task = taskService.createTaskQuery().processInstanceId(flow.getProcInsId()).active().singleResult();
         // task为null时，则当前节点为最后一个审核节点
@@ -1035,9 +1036,21 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             if(org.apache.commons.lang3.StringUtils.isNotBlank(flow.getAssignee ())){
                 taskService.setAssignee(task.getId(), flow.getAssignee ());
             }
+            if(ObjectUtil.isNotEmpty(report)) {
+                CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.selectOne(new QueryWrapper<CwProjectReportSignature>().lambda()
+                        .eq(CwProjectReportSignature::getReportId, report.getId())
+                        .eq(CwProjectReportSignature::getType, report.getSignatureType())
+                );
+                if ("2".equals(cwProjectReportSignature.getStatus())){
+                    cwProjectReportSignature.setStatus("6");
+                    cwProjectReportSignatureMapper.updateById(cwProjectReportSignature);
+                }else if ("6".equals(cwProjectReportSignature.getStatus())){
+                    cwProjectReportSignature.setStatus("7");
+                    cwProjectReportSignatureMapper.updateById(cwProjectReportSignature);
+                }
+            }
         } else {
             // 修改数据流程状态为->审核通过
-            CwProjectReport report = this.getOne(new QueryWrapper<CwProjectReport>().lambda().eq(CwProjectReport::getId, cwProjectReportData.getId()));
             if (ObjectUtil.isNotEmpty(report)){
                 CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.selectOne(new QueryWrapper<CwProjectReportSignature>().lambda()
                         .eq(CwProjectReportSignature::getReportId, report.getId())