省级联审后 保存审核经过

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -321,4 +321,7 @@ public class Project implements Serializable {
     @ApiModelProperty("项目申报书")
     private String projectApplicationForm;
 
+    @ApiModelProperty("省级联审 审批结果")
+    private String sjlsResult;
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -319,6 +319,9 @@ public class ProjectDetailVO {
     @ApiModelProperty("项目申报书")
     private String projectApplicationForm;
 
+    @ApiModelProperty("省级联审 审批结果")
+    private String sjlsResult;
+
     private LocalDateTime createOn;
     private LocalDateTime updateOn;
 

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java

@@ -16,6 +16,7 @@ import com.ningdatech.pmapi.provincial.service.IJoinReviewProvincialBureauServic
 import com.ningdatech.pmapi.scheduler.contants.TaskContant;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import java.net.InetAddress;
@@ -76,25 +77,37 @@ public class CheckProvincialReviewResultTask {
                         log.info("此项目 【{}】 还在审核中",projectRes.getProjectId());
                     }else if(ProjectProvincialAuditStatusEnum.SUCCESS.getCode().equals(projectRes.getProjectStatus())){
                         log.info("此项目 【{}】 审核通过",projectRes.getProjectId());
-                        //直接去预审
                         stateMachineUtils.pass(project);
                         project.setUpdateOn(LocalDateTime.now());
+                        //保存审核结果
+                        project.setSjlsResult(CollUtil.isNotEmpty(projectRes.getProcessComment())
+                                ? JSON.toJSONString(projectRes.getProcessComment()) : StringUtils.EMPTY);
                         projectService.updateById(project);
+                        //直接去预审
                         prequalificationDeclaredProjectManage.directStartProcess(project,project.getPreStartUserId());
                     }else if(ProjectProvincialAuditStatusEnum.FAIL.getCode().equals(projectRes.getProjectStatus())){
                         log.info("此项目 【{}】 审核不通过",projectRes.getProjectId());
                         stateMachineUtils.reject(project);
                         project.setUpdateOn(LocalDateTime.now());
+                        //保存审核结果
+                        project.setSjlsResult(CollUtil.isNotEmpty(projectRes.getProcessComment())
+                                ? JSON.toJSONString(projectRes.getProcessComment()) : StringUtils.EMPTY);
                         projectService.updateById(project);
                     }else if(ProjectProvincialAuditStatusEnum.WITHDRAW.getCode().equals(projectRes.getProjectStatus())){
                         log.info("此项目 【{}】 审核被撤回",projectRes.getProjectId());
                         stateMachineUtils.reject(project);
                         project.setUpdateOn(LocalDateTime.now());
+                        //保存审核结果
+                        project.setSjlsResult(CollUtil.isNotEmpty(projectRes.getProcessComment())
+                                ? JSON.toJSONString(projectRes.getProcessComment()) : StringUtils.EMPTY);
                         projectService.updateById(project);
                     }else if(ProjectProvincialAuditStatusEnum.BACK.getCode().equals(projectRes.getProjectStatus())){
                         log.info("此项目 【{}】 审核被退回",projectRes.getProjectId());
                         stateMachineUtils.reject(project);
                         project.setUpdateOn(LocalDateTime.now());
+                        //保存审核结果
+                        project.setSjlsResult(CollUtil.isNotEmpty(projectRes.getProcessComment())
+                                ? JSON.toJSONString(projectRes.getProcessComment()) : StringUtils.EMPTY);
                         projectService.updateById(project);
                     }else{
                         log.info("此项目 【{}】 审核结果错误",projectRes.getProjectId());