Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management

pmapi/src/main/java/com/ningdatech/pmapi/common/enums/ProjectProessStageEnum.java

@@ -0,0 +1,22 @@
+package com.ningdatech.pmapi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public enum ProjectProessStageEnum {
+    /**
+     * 项目流程配置 阶段枚举
+     */
+    ORG_INTERNAL_APPROVAL_PROCESS(1,"单位内部审批流程"),
+    PROJECT_PREQUALIFICATION_APPROVAL_PROCESS(2,"项目预审审批流程"),
+    DEPARTMENT_JOINT_APPROVAL_PROCESS(3,"部门联合审批流程"),
+    CONSTRUCTION_PROJECT_APPROVAL_PROCESS(4,"建设方案审批流程"),
+    ACCEPTANCE_DECLARATION_APPROVAL_PROCESS(5,"验收申报审批流程");
+
+    private Integer code;
+    private String desc;
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/contants/DeclaredProjectContant.java

@@ -0,0 +1,17 @@
+package com.ningdatech.pmapi.projectdeclared.contants;
+
+public interface DeclaredProjectContant {
+
+    class ProcessDef {
+        public static final String PROJECT_STAGE_1 = "单位内部审批流程";
+
+        public static final String PROJECT_STAGE_2 = "项目预审审批流程";
+
+        public static final String PROJECT_STAGE_3 = "部门联合审批流程";
+
+        public static final String PROJECT_STAGE_4 = "建设方案审批流程";
+
+        public static final String PROJECT_STAGE_5 = "验收申报审批流程";
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/ProjectDraft.java

@@ -404,9 +404,11 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("试点文件")
     private String experimentsFile;
 
-    @ApiModelProperty("新增form内容")
-    private String formData;
+    @ApiModelProperty("项目应用")
+    private String projectApplicationList;
 
+    @ApiModelProperty("新增form内容")
+    private String dynamicForm;
 
     private Long createBy;
     private Long updateBy;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectListParamDto.java

@@ -22,9 +22,9 @@ public class DeclaredProjectListParamDto extends PagePo {
 
     private Integer projectType;
 
-    private Integer projectStatusFirst;
+    private Integer projectStage;
 
-    private Integer projectStatusSecond;
+    private Integer projectStatus;
 
     private Integer projectYear;
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.common.enums.ProjectProessStageEnum;
 import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectDto;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDto;
@@ -66,8 +67,8 @@ public class DeclaredProjectManage {
                 .le(Objects.nonNull(params.getEndTime()), Project::getCreateOn, params.getEndTime())
                 .eq(Objects.nonNull(params.getProjectType()), Project::getProjectType, params.getProjectType())
                 .eq(Objects.nonNull(params.getProjectYear()), Project::getProjectYear, params.getProjectYear())
-                .eq(Objects.nonNull(params.getProjectStatusFirst()), Project::getProjectStatusFirst, params.getProjectStatusFirst())
-                .eq(Objects.nonNull(params.getProjectStatusSecond()), Project::getProjectStatusSecond, params.getProjectStatusSecond())
+                .eq(Objects.nonNull(params.getProjectStage()), Project::getStage, params.getProjectStage())
+                .eq(Objects.nonNull(params.getProjectStatus()), Project::getStatus, params.getProjectStatus())
                 .like(StringUtils.isNotBlank(params.getProjectName()), Project::getProjectName, params.getProjectName())
                 .orderByDesc(Project::getUpdateOn);
         projectService.page(page,wrapper);
@@ -99,8 +100,8 @@ public class DeclaredProjectManage {
                 .le(Objects.nonNull(params.getEndTime()), ProjectDraft::getCreateOn, params.getEndTime())
                 .eq(Objects.nonNull(params.getProjectType()), ProjectDraft::getProjectType, params.getProjectType())
                 .eq(Objects.nonNull(params.getProjectYear()), ProjectDraft::getProjectYear, params.getProjectYear())
-                .eq(Objects.nonNull(params.getProjectStatusFirst()), ProjectDraft::getProjectStatusFirst, params.getProjectStatusFirst())
-                .eq(Objects.nonNull(params.getProjectStatusSecond()), ProjectDraft::getProjectStatusSecond, params.getProjectStatusSecond())
+                .eq(Objects.nonNull(params.getProjectStage()), ProjectDraft::getProjectStatusFirst, params.getProjectStage())
+                .eq(Objects.nonNull(params.getProjectStatus()), ProjectDraft::getProjectStatusSecond, params.getProjectStatus())
                 .like(StringUtils.isNotBlank(params.getProjectName()), ProjectDraft::getProjectName, params.getProjectName())
                 .orderByDesc(ProjectDraft::getUpdateOn);
         projectDraftService.page(page,wrapper);
@@ -132,7 +133,7 @@ public class DeclaredProjectManage {
 
         WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class)
                 .eq(WflowModels::getRegionCode, regionCode)
-                .eq(WflowModels::getFormName, "单位内部审批流程")
+                .eq(WflowModels::getFormName, ProjectProessStageEnum.ORG_INTERNAL_APPROVAL_PROCESS.getDesc())
                 .last("limit 1"));
 
         if(Objects.isNull(model)){
@@ -157,8 +158,8 @@ public class DeclaredProjectManage {
             project.setCreateOn(LocalDateTime.now());
             project.setUpdateOn(LocalDateTime.now());
             project.setAreaCode(regionCode);
-            project.setProjectStatusFirst(ProjectStatusEnum.NOT_APPROVED.getCode());
-            project.setProjectStatusSecond(ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode());
+            project.setStage(ProjectStatusEnum.NOT_APPROVED.getCode());
+            project.setStatus(ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode());
             project.setInstCode(instanceId);
             projectService.save(project);
         }catch (Exception e){