fix:预警退回不能再次提交问题

src/main/java/com/biutag/supervision/pojo/request/warning/WarningEndRequest.java

@@ -20,6 +20,9 @@ public class WarningEndRequest implements ParamChecked {
     @Schema(description = "项目id")
     private String reportId;
 
+    @Schema(description = "flowId")
+    private String flowId;
+
     //是否通知报审人
     private String isInform;
 
@@ -30,7 +33,11 @@ public class WarningEndRequest implements ParamChecked {
     @Override
     public void check() {
         if (StrUtil.isBlank(reportId)){
-            throw  new RuntimeException("项目id不能为空");
+            throw  new IllegalArgumentException("项目id不能为空");
+        }
+
+        if (StrUtil.isBlank(flowId)){
+            throw  new IllegalArgumentException("flowid不能为空");
         }
     }
 }

src/main/java/com/biutag/supervision/pojo/vo/work/ProjectWorkVo.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.pojo.vo.work;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -7,6 +8,9 @@ import java.time.LocalDateTime;
 @Data
 public class ProjectWorkVo {
 
+    @Schema(description = "流程id")
+    private String flowId;
+
     //项目名称
     public String reportName;
     //项目类型

src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java

@@ -490,6 +490,14 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
 
         UserAuth currentUser = UserContextHolder.getCurrentUser();
 
+        LambdaUpdateWrapper<ReportFlow> reportFlowLambdaQueryWrapper = new LambdaUpdateWrapper<>();
+        reportFlowLambdaQueryWrapper.eq(ReportFlow::getId,queryParam.getFlowId());
+        reportFlowLambdaQueryWrapper.set(ReportFlow::getApproverState, "end");
+        reportFlowLambdaQueryWrapper.set(ReportFlow::getApprover, currentUser.getUserName());
+        reportFlowLambdaQueryWrapper.set(ReportFlow::getApproverUnit, currentUser.getDepartName());
+        reportFlowLambdaQueryWrapper.set(ReportFlow::getApproverUnitId, currentUser.getDepartId());
+        int update = baseMapper.update(reportFlowLambdaQueryWrapper);
+
         // 留痕：写一条结束记录
         ReportFlow endFlow = new ReportFlow();
         endFlow.setReportId(queryParam.getReportId());
@@ -508,5 +516,6 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
         //
         endFlow.setType("end");
         boolean ok2 = baseMapper.insert(endFlow) > 0;
-        return Result.success(ok1 && ok2);    }
+        return Result.success(ok1 && ok2 && update==1);
+    }
 }

src/main/resources/mapper/ReportProjectMapper.xml

@@ -15,7 +15,8 @@
         flow.report_link as flowCode,
         flow.approver_state as approverState,
         if(w.id is not null ,1,0) as isWarning,
-        w.id as warningId
+        w.id as warningId,
+        flow.id as flowId
         FROM
         report_flow  as flow
         LEFT JOIN report_project as project on project.id = flow.report_id