fit:执行流程按钮

assistMg/src/main/java/com/hotent/constant/NodeConstant.java

@@ -3,7 +3,7 @@ package com.hotent.constant;
 public enum NodeConstant {
 
     tjcl("tjcl", "提交材料"),
-    ccls("clcs", "材料初审"),
+    clcs("clcs", "材料初审"),
     sdshenhe("sdshenhe", "实地审核"),
     yjgaozhi("yjgaozhi", "意见告知"),
     yjfk("yjfk", "意见反馈"),

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/CostAuditReviewController.java

@@ -207,17 +207,17 @@ public class CostAuditReviewController {
         String resultMessage = "";
 
         switch (req.getKey()) {
-            case "1":
-                // 通过
-                resultMessage = supplementTask(task);
-                break;
             case "2":
                 // 中止
-                resultMessage = suspendTask(task);
+                resultMessage = suspendTask(task,req);
+                break;
+            case "3":
+                // 通过
+                resultMessage = supplementTask(task);
                 break;
             case "4":
                 // 退回
-                resultMessage = returnToSubmit(task);
+                resultMessage = returnToSubmit(task,req);
                 break;
             default:
                 return CommonResult.<String>error().message("未知的操作类型");
@@ -284,7 +284,7 @@ public class CostAuditReviewController {
     /**
      * 初审退回，退回企业补充材料，并可额外增加补充材料。
      */
-    private String returnToSubmit(CostProjectTask task) {
+    private String returnToSubmit(CostProjectTask task,CostTaskPageReq req) {
         // 获取流程信息
         CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
                 new LambdaQueryWrapper<CostProjectTaskProccess>()
@@ -292,15 +292,10 @@ public class CostAuditReviewController {
         );
         // 通知内容组装
         String title = "材料初审退回";
-        String auditedUnit = task.getAuditedUnitName() == null ? "" : task.getAuditedUnitName();
-        String projectName = task.getProjectName() == null ? "" : task.getProjectName();
-        String year = task.getYear() == null ? "" : task.getYear();
-        String content = String.format("%s%s%s材料初审因材料不全被退回，请补充完善。", year, projectName, auditedUnit);
         String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
         String noticeSource = "系统";
         String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-
-        costNoticeManager.sendNotice(task.getProjectId(), "1", title, content, enterpriseId, noticeSource, sendTarget);
+        costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
 
         // 退回提交材料环节
         taskProccess.setCurrentNode(NodeConstant.tjcl.getNodeKey());
@@ -317,12 +312,19 @@ public class CostAuditReviewController {
     /**
      * 中止监审，填写中止原因，并中止被监审单位审核
      */
-    private String suspendTask(CostProjectTask task) {
+    private String suspendTask(CostProjectTask task,CostTaskPageReq req) {
 
         // 更新任务状态为中止
         task.setStatus(TaskStatusConstant.SUSPENDED.getStatusCode());
         costProjectTaskManager.updateById(task);
 
+        // 通知内容组装
+        String title = "材料初审中止";
+        String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
+        String noticeSource = "系统";
+        String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
+        costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
+
         // 更新流程阶段为中止（保持当前节点不变，但状态为中止）
         CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
                 new LambdaQueryWrapper<CostProjectTaskProccess>()
@@ -332,7 +334,7 @@ public class CostAuditReviewController {
             costProjectTaskProccessManager.updateById(taskProccess);
         }
 
-        return "监审任务已中止";
+        return "初审已中止";
     }
 
 

assistMg/src/main/java/com/hotent/enterpriseDeclare/req/CostTaskPageReq.java

@@ -16,4 +16,10 @@ public class CostTaskPageReq {
     @ApiModelProperty(value = "按钮操作key：1-补充材料、2-中止、3-退回上一步、4-退回、5-归档")
     private String key;
 
+    @ApiModelProperty(value = "发送方式 1站内消息 2短信通知 “,”分割")
+    private String sendType;
+
+
+    @ApiModelProperty(value = "意见")
+    private String content;
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectProccessManagerImpl.java

@@ -200,7 +200,7 @@ public class CostProjectProccessManagerImpl extends BaseManagerImpl<CostProjectP
         costProjectProccess.setPlannedAuditStartDate(req.getPlannedAuditStartDate());
         costProjectProccess.setPlannedAuditEndDate(req.getPlannedAuditEndDate());
         costProjectProccess.setStatus(1);
-        costProjectProccess.setCurrentNode(NodeConstant.ccls.getNodeKey());
+        costProjectProccess.setCurrentNode(NodeConstant.clcs.getNodeKey());
         costProjectProccess.setProccessTempleteId("1");
         this.saveOrUpdate(costProjectProccess);
 

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -75,12 +75,12 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 new QueryWrapper<CostProjectTaskProccess>()
                         .eq("task_id", costTaskPageReq.getTaskId())
         );
-        taskProccess.setCurrentNode(NodeConstant.ccls.getNodeKey());
+        taskProccess.setCurrentNode(NodeConstant.clcs.getNodeKey());
         costProjectTaskProccessManager.updateById(taskProccess);
 
         // 3. 子流程状态改为审核中
         CostProjectTask task = this.getById(costTaskPageReq.getTaskId());
-        task.setCurrentNode(NodeConstant.ccls.getNodeKey());
+        task.setCurrentNode(NodeConstant.clcs.getNodeKey());
         task.setStatus(TaskStatusConstant.AUDITING.getStatusCode());
         this.updateById(task);