需求变更

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -142,9 +142,9 @@ public class DefaultDeclaredProjectManage {
     }
 
     //直接提交预审方法 提取 在省级联审通过的时候 也可以用
-    public String directStartProcess(Project projectInfo){
-        UserInfoDetails userInfoDetails = LoginUserUtil.loginUserDetail();
-        Long userId = userInfoDetails.getUserId();
+    public String directStartProcess(Project projectInfo,Long userId){
+        VUtils.isTrue(Objects.isNull(userId))
+                .throwMessage("发起人Id 不能为空!");
 
         ProcessStartParamsVo params = new ProcessStartParamsVo();
         params.setUser(buildUser(userId));
@@ -173,7 +173,7 @@ public class DefaultDeclaredProjectManage {
         log.info("提交预审项目成功 【{}】", instanceId);
 
         //保存预审项目
-        modifyProject(projectInfo, instanceId);
+        preModifyProject(projectInfo, instanceId);
 
         return instanceId;
     }
@@ -184,13 +184,11 @@ public class DefaultDeclaredProjectManage {
      * @param project
      * @param instanceId
      */
-    private void modifyProject(Project project, String instanceId) {
+    private void preModifyProject(Project project, String instanceId) {
         //流程启动之后 入库项目 重要业务信息 用于列表查询 展示
         try {
             project.setUpdateOn(LocalDateTime.now());
             project.setInstCode(instanceId);
-            //调用状态机 进入下一个通过状态
-            stateMachineUtils.pass(project);
             projectService.updateById(project);
 
             //保存项目和实例的关系

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java

@@ -116,6 +116,8 @@ public class PrequalificationDeclaredProjectManage {
                 .getCode().equals(projectInfo.getStatus())){
             //入库暂存表 后续处理 对接外部接口
             projectInfo.setUpdateOn(LocalDateTime.now());
+            //保存一下  当前的主管单位发起人
+            projectInfo.setPreStartUserId(userId);
             if(projectStagingService.addByProject(projectInfo,"省级部门联审")
                     && projectService.updateById(projectInfo)){
                 return "提交省级部门联审成功";
@@ -124,7 +126,7 @@ public class PrequalificationDeclaredProjectManage {
         }else if(ProjectStatusEnum.PRE_APPLYING
                 .getCode().equals(projectInfo.getStatus())){
             //如果是非省级联审的项目 直接提交 预审
-            instanceId = defaultDeclaredProjectManage.directStartProcess(projectInfo);
+            instanceId = defaultDeclaredProjectManage.directStartProcess(projectInfo,userId);
         }else{
             throw new BusinessException("项目状态 错误 project :" + JSON.toJSONString(projectInfo));
         }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java

@@ -54,7 +54,8 @@ public class ReviewByProvincialDeptManage {
             stateMachineUtils.pass(project);
             projectService.updateById(project);
             //直接去预审
-            if(StringUtils.isNotBlank(defaultProjectManage.directStartProcess(project))){
+            if(StringUtils.isNotBlank(defaultProjectManage
+                    .directStartProcess(project,project.getPreStartUserId()))){
                 return Boolean.TRUE;
             }
         }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java

@@ -282,6 +282,9 @@ public class ProjectDTO implements Serializable {
     @ApiModelProperty("项目发起人")
     private Long sponsor;
 
+    @ApiModelProperty("上级条线单位审核意见")
+    private String higherLineSuperOrgReviewComments;
+
     private Map<String,Object> dynamicForm;
 
 }

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

@@ -297,6 +297,12 @@ public class Project implements Serializable {
     @ApiModelProperty("项目发起人 用户id")
     private Long sponsor;
 
+    @ApiModelProperty("预审发起人 用户id")
+    private Long preStartUserId;
+
+    @ApiModelProperty("上级条线单位审核意见")
+    private String higherLineSuperOrgReviewComments;
+
     @TableField(fill = FieldFill.INSERT)
     private Long createBy;
 

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

@@ -289,6 +289,9 @@ public class ProjectDetailVO {
     @ApiModelProperty("项目发起人id")
     private Long sponsor;
 
+    @ApiModelProperty("上级条线单位审核意见")
+    private String higherLineSuperOrgReviewComments;
+
     private String projectTypeName;
 
     public String getProjectTypeName() {