Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java

@@ -35,9 +35,9 @@ public class ConstructionPlanController {
     @ApiOperation(value = "可申报建设方案项目列表", notes = "可申报建设方案项目列表")
     @GetMapping("/list")
     public PageVo<ProjectLibListItemVO> list(@Validated @ModelAttribute ProjectListReq req) {
-        //项目阶段 状态 已定 待预审
+        //项目阶段 状态 已定 方案待申报
         req.setStage(ProjectStatusEnum.NOT_APPROVED.getCode());
-        req.setStatus(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode());
+        req.setStatus(ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode());
         return projectLibManage.projectLibList(req);
     }
 

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

@@ -67,13 +67,13 @@ public class ProjectDraft implements Serializable {
     private String contactPhone;
 
     @ApiModelProperty("建设单位名称")
-    private String buildUnitName;
+    private String buildOrgName;
 
     @ApiModelProperty("建设单位统一社会信用代码")
-    private String buildUnitCode;
+    private String buildOrgCode;
 
     @ApiModelProperty("建设单位浙政钉ID")
-    private String buildUnitZheJiangGovernmentDingId;
+    private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("项目类型 1:建设 2:运维")
     private Integer projectType;
@@ -132,10 +132,10 @@ public class ProjectDraft implements Serializable {
     private BigDecimal declareHaveAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
-    private BigDecimal declareGovernmentOwnFinanceAmount;
+    private BigDecimal declareGovOwnFinanceAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
-    private BigDecimal declareGovernmentSuperiorFinanceAmount;
+    private BigDecimal declareGovSuperiorFinanceAmount;
 
     @ApiModelProperty("银行贷款(万元)")
     private BigDecimal declareBankLendingAmount;
@@ -159,10 +159,10 @@ public class ProjectDraft implements Serializable {
     private BigDecimal annualPlanHaveAmount;
 
     @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
-    private BigDecimal annualPlanGovernmentOwnFinanceAmount;
+    private BigDecimal annualPlanGovOwnFinanceAmount;
 
     @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
-    private BigDecimal annualPlanGovernmentSuperiorFinanceAmount;
+    private BigDecimal annualPlanGovSuperiorFinanceAmount;
 
     @ApiModelProperty("年度支付计划-银行贷款(万元)")
     private BigDecimal annualPlanBankLendingAmount;
@@ -267,143 +267,20 @@ public class ProjectDraft implements Serializable {
     private BigDecimal approvedTotalInvestmentIncrease;
 
     @ApiModelProperty("上级主管部门")
-    private String higherSuperUnit;
+    private String higherSuperOrg;
 
     @ApiModelProperty("上级主管部门Code")
-    private String higherSuperUnitCode;
+    private String higherSuperOrgCode;
 
     @ApiModelProperty("主管部门名称")
-    private String superUnit;
+    private String superOrg;
 
     @ApiModelProperty("主管部门Code")
-    private String superUnitCode;
+    private String superOrgCode;
 
     @ApiModelProperty("前端所需验证字段")
     private Integer allApplicationsDone;
 
-    @ApiModelProperty("项目一级状态 10000 20000 30000")
-    private Integer projectStatusFirst;
-
-    @ApiModelProperty("项目二级状态")
-    private Integer projectStatusSecond;
-
-    @ApiModelProperty("应用名称")
-    private String applicationName;
-
-    @ApiModelProperty("关联IRS现有应用")
-    private String relatedExistsApplication;
-
-    @ApiModelProperty("关联IRS现有应用-IRS应用编码")
-    private String relatedExistsApplicationCode;
-
-    @ApiModelProperty("应用类型")
-    private String applicationType;
-
-    @ApiModelProperty("是否统建应用 0:否 1:是")
-    private Integer isUniteBuild;
-
-    @ApiModelProperty("统建类型 1:全省统建 2:全市统建")
-    private Integer unionBuildKind;
-
-    @ApiModelProperty("是否数改系统 0:否 1:是")
-    private Integer isDigitalModification;
-
-    @ApiModelProperty("数改系统")
-    private String digitalModification;
-
-    @ApiModelProperty("发布端")
-    private String publishSide;
-
-    @ApiModelProperty("是否一本账场景应用名称 0:否 1:是")
-    private Integer isAccountAppName;
-
-    @ApiModelProperty("一本账应用名称")
-    private String accountAppName;
-
-    @ApiModelProperty("领域大脑一本账")
-    private String domainBrainAccount;
-
-    @ApiModelProperty("是否业务协同 0:否 1:是")
-    private Integer isBizCooperate;
-
-    @ApiModelProperty("业务协同描述")
-    private String bizCooperateInfo;
-
-    @ApiModelProperty("使用范围")
-    private String usesRangeRemark;
-
-    @ApiModelProperty("应用简介")
-    private String applicationSummary;
-
-    @ApiModelProperty("应用备注")
-    private String applicationRemark;
-
-    @ApiModelProperty("应用总投资测算明细-文件")
-    private String applicationEstimateFile;
-
-    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer secrecyGrade;
-
-    @ApiModelProperty("密码测评级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer passwordGrade;
-
-    @ApiModelProperty("是否符合国家信息技术应用创新相关规范 0:否 1:是")
-    private Integer nationalItSpec;
-
-    @ApiModelProperty("是否使用政务云资源 0否 1是")
-    private Integer useGovCloud;
-
-    @ApiModelProperty("云资源类型")
-    private String cloudsType;
-
-    @ApiModelProperty("云资源基础规格")
-    private String cloudsFoundationSpecifications;
-
-    @ApiModelProperty("云资源台数")
-    private Integer cloudsNumber;
-
-    @ApiModelProperty("云资源用户描述")
-    private String cloudsDescription;
-
-    @ApiModelProperty("网络环境 1:政务内网 2:政务外网 3:互联网 4:业务专网 5:单机")
-    private Integer netEnv;
-
-    @ApiModelProperty("是否使用公共数据 0否 1是")
-    private Integer useCommonData;
-
-    @ApiModelProperty("数据名称")
-    private String dataName;
-
-    @ApiModelProperty("是否使用公共组件 0否 1是")
-    private Integer useCommonComponent;
-
-    @ApiModelProperty("使用的公共组件名称")
-    private String commonComponents;
-
-    @ApiModelProperty("是否产生公共组件 0否 1是")
-    private Integer produceCommonComponent;
-
-    @ApiModelProperty("预计产生组件名称")
-    private String produceCommonComponents;
-
-    @ApiModelProperty("试点任务名称")
-    private String pilotTasksName;
-
-    @ApiModelProperty("试点任务编号")
-    private String pilotTasksCode;
-
-    @ApiModelProperty("所属重大应用名称")
-    private String importantTaskName;
-
-    @ApiModelProperty("所属重大应用编号")
-    private String importantTaskCode;
-
-    @ApiModelProperty("所属子场景应用名称")
-    private String subSceneApplicationName;
-
-    @ApiModelProperty("试点文件")
-    private String experimentsFile;
-
     @ApiModelProperty("项目应用")
     private String projectApplicationList;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/vo/ProjectDraftVo.java

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,6 +13,8 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -65,13 +68,13 @@ public class ProjectDraftVo implements Serializable {
     private String contactPhone;
 
     @ApiModelProperty("建设单位名称")
-    private String buildUnitName;
+    private String buildOrgName;
 
     @ApiModelProperty("建设单位统一社会信用代码")
-    private String buildUnitCode;
+    private String buildOrgCode;
 
     @ApiModelProperty("建设单位浙政钉ID")
-    private String buildUnitZheJiangGovernmentDingId;
+    private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("项目类型 1:建设 2:运维")
     private Integer projectType;
@@ -130,10 +133,10 @@ public class ProjectDraftVo implements Serializable {
     private BigDecimal declareHaveAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
-    private BigDecimal declareGovernmentOwnFinanceAmount;
+    private BigDecimal declareGovOwnFinanceAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
-    private BigDecimal declareGovernmentSuperiorFinanceAmount;
+    private BigDecimal declareGovSuperiorFinanceAmount;
 
     @ApiModelProperty("银行贷款(万元)")
     private BigDecimal declareBankLendingAmount;
@@ -157,10 +160,10 @@ public class ProjectDraftVo implements Serializable {
     private BigDecimal annualPlanHaveAmount;
 
     @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
-    private BigDecimal annualPlanGovernmentOwnFinanceAmount;
+    private BigDecimal annualPlanGovOwnFinanceAmount;
 
     @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
-    private BigDecimal annualPlanGovernmentSuperiorFinanceAmount;
+    private BigDecimal annualPlanGovSuperiorFinanceAmount;
 
     @ApiModelProperty("年度支付计划-银行贷款(万元)")
     private BigDecimal annualPlanBankLendingAmount;
@@ -265,145 +268,28 @@ public class ProjectDraftVo implements Serializable {
     private BigDecimal approvedTotalInvestmentIncrease;
 
     @ApiModelProperty("上级主管部门")
-    private String higherSuperUnit;
+    private String higherSuperOrg;
 
     @ApiModelProperty("上级主管部门Code")
-    private String higherSuperUnitCode;
+    private String higherSuperOrgCode;
 
     @ApiModelProperty("主管部门名称")
-    private String superUnit;
+    private String superOrg;
 
     @ApiModelProperty("主管部门Code")
-    private String superUnitCode;
+    private String superOrgCode;
 
     @ApiModelProperty("前端所需验证字段")
     private Integer allApplicationsDone;
 
-    @ApiModelProperty("项目一级状态 10000 20000 30000")
-    private Integer projectStatusFirst;
-
-    @ApiModelProperty("项目二级状态")
-    private Integer projectStatusSecond;
-
-    @ApiModelProperty("应用名称")
-    private String applicationName;
-
-    @ApiModelProperty("关联IRS现有应用")
-    private String relatedExistsApplication;
-
-    @ApiModelProperty("关联IRS现有应用-IRS应用编码")
-    private String relatedExistsApplicationCode;
-
-    @ApiModelProperty("应用类型")
-    private String applicationType;
-
-    @ApiModelProperty("是否统建应用 0:否 1:是")
-    private Integer isUniteBuild;
-
-    @ApiModelProperty("统建类型 1:全省统建 2:全市统建")
-    private Integer unionBuildKind;
-
-    @ApiModelProperty("是否数改系统 0:否 1:是")
-    private Integer isDigitalModification;
-
-    @ApiModelProperty("数改系统")
-    private String digitalModification;
-
-    @ApiModelProperty("发布端")
-    private String publishSide;
-
-    @ApiModelProperty("是否一本账场景应用名称 0:否 1:是")
-    private Integer isAccountAppName;
-
-    @ApiModelProperty("一本账应用名称")
-    private String accountAppName;
-
-    @ApiModelProperty("领域大脑一本账")
-    private String domainBrainAccount;
-
-    @ApiModelProperty("是否业务协同 0:否 1:是")
-    private Integer isBizCooperate;
-
-    @ApiModelProperty("业务协同描述")
-    private String bizCooperateInfo;
-
-    @ApiModelProperty("使用范围")
-    private String usesRangeRemark;
-
-    @ApiModelProperty("应用简介")
-    private String applicationSummary;
-
-    @ApiModelProperty("应用备注")
-    private String applicationRemark;
-
-    @ApiModelProperty("应用总投资测算明细-文件")
-    private String applicationEstimateFile;
-
-    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer secrecyGrade;
-
-    @ApiModelProperty("密码测评级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer passwordGrade;
-
-    @ApiModelProperty("是否符合国家信息技术应用创新相关规范 0:否 1:是")
-    private Integer nationalItSpec;
-
-    @ApiModelProperty("是否使用政务云资源 0否 1是")
-    private Integer useGovCloud;
-
-    @ApiModelProperty("云资源类型")
-    private String cloudsType;
-
-    @ApiModelProperty("云资源基础规格")
-    private String cloudsFoundationSpecifications;
-
-    @ApiModelProperty("云资源台数")
-    private Integer cloudsNumber;
-
-    @ApiModelProperty("云资源用户描述")
-    private String cloudsDescription;
-
-    @ApiModelProperty("网络环境 1:政务内网 2:政务外网 3:互联网 4:业务专网 5:单机")
-    private Integer netEnv;
-
-    @ApiModelProperty("是否使用公共数据 0否 1是")
-    private Integer useCommonData;
-
-    @ApiModelProperty("数据名称")
-    private String dataName;
-
-    @ApiModelProperty("是否使用公共组件 0否 1是")
-    private Integer useCommonComponent;
-
-    @ApiModelProperty("使用的公共组件名称")
-    private String commonComponents;
-
-    @ApiModelProperty("是否产生公共组件 0否 1是")
-    private Integer produceCommonComponent;
-
-    @ApiModelProperty("预计产生组件名称")
-    private String produceCommonComponents;
-
-    @ApiModelProperty("试点任务名称")
-    private String pilotTasksName;
-
-    @ApiModelProperty("试点任务编号")
-    private String pilotTasksCode;
-
-    @ApiModelProperty("所属重大应用名称")
-    private String importantTaskName;
-
-    @ApiModelProperty("所属重大应用编号")
-    private String importantTaskCode;
-
-    @ApiModelProperty("所属子场景应用名称")
-    private String subSceneApplicationName;
-
-    @ApiModelProperty("试点文件")
-    private String experimentsFile;
+    @ApiModelProperty("项目应用")
+    private List<ProjectApplication> applicationList;
 
     @ApiModelProperty("新增form内容")
-    private String formData;
+    private Map<String,Object> dynamicForm;
+
+    @ApiModelProperty("用户id")
+    private String userId;
 
 
     private Long createBy;

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

@@ -20,7 +20,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
-
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.Map;
@@ -68,8 +67,8 @@ public class ConstructionPlanManage {
             throw new BusinessException(String.format("此 【%s】区域找不到 建设申报流程配置", regionCode));
         }
 
-        //首先要判断 项目当前状态 是不是 待预审
-        VUtils.isTrue(!ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode().equals(projectInfo.getStatus()) ||
+        //首先要判断 项目当前状态 是不是 方案待申报
+        VUtils.isTrue(!ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode().equals(projectInfo.getStatus()) ||
                         !ProjectStatusEnum.NOT_APPROVED.getCode().equals(projectInfo.getStage()))
                 .throwMessage("提交失败 该项目不是 待预审状态或者未立项阶段");
         //TODO 再判断 该项目是否 真实走完 单位内部审批
@@ -88,7 +87,7 @@ public class ConstructionPlanManage {
         }
         params.setFormData(dto.getFormData());
         String instanceId = processService.startProcess(model.getProcessDefId(), params);
-        log.info("提交预审项目成功 【{}】", instanceId);
+        log.info("建设方案项目申报成功 【{}】", instanceId);
 
         //保存建设项目
         modifyProject(projectInfo, instanceId, dto.getConstructionPlanFile());

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

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.manage;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -85,16 +86,6 @@ public class DeclaredProjectManage {
         return PageVo.of(res, page.getTotal());
     }
 
-    public ProjectDeclaredDetailVO detail(Long id) {
-        Project project = projectService.getById(id);
-        ProjectDeclaredDetailVO vo = new ProjectDeclaredDetailVO();
-        BeanUtils.copyProperties(project, vo);
-        List<ProjectApplication> projectApptions = projectApplicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
-                .eq(ProjectApplication::getProjectId, id));
-        vo.setProjectApplications(projectApptions);
-        return vo;
-    }
-
     public PageVo<ProjectDraftVo> pageDraft(DeclaredProjectListParamDto params) {
         Page<ProjectDraft> page = params.page();
         LambdaQueryWrapper<ProjectDraft> wrapper = Wrappers.lambdaQuery(ProjectDraft.class)
@@ -103,8 +94,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.getProjectStage()), ProjectDraft::getProjectStatusFirst, params.getProjectStage())
-                .eq(Objects.nonNull(params.getProjectStatus()), ProjectDraft::getProjectStatusSecond, params.getProjectStatus())
+                .eq(Objects.nonNull(params.getProjectStage()), ProjectDraft::getStage, params.getProjectStage())
+                .eq(Objects.nonNull(params.getProjectStatus()), ProjectDraft::getStatus, params.getProjectStatus())
                 .like(StringUtils.isNotBlank(params.getProjectName()), ProjectDraft::getProjectName, params.getProjectName())
                 .orderByDesc(ProjectDraft::getUpdateOn);
         projectDraftService.page(page, wrapper);
@@ -123,6 +114,12 @@ public class DeclaredProjectManage {
         ProjectDraft draft = projectDraftService.getById(id);
         ProjectDraftVo vo = new ProjectDraftVo();
         BeanUtils.copyProperties(draft, vo);
+        if(StringUtils.isNotBlank(draft.getProjectApplicationList())){
+            vo.setApplicationList(JSON.parseArray(draft.getProjectApplicationList(),ProjectApplication.class));
+        }
+        if(StringUtils.isNotBlank(draft.getDynamicForm())){
+            vo.setDynamicForm(JSON.parseObject(draft.getDynamicForm(),Map.class));
+        }
         return vo;
     }
 
@@ -214,6 +211,12 @@ public class DeclaredProjectManage {
         ProjectDraft draft = new ProjectDraft();
         BeanUtils.copyProperties(projectInfo, draft);
         draft.setUserId(dto.getUser().getUserId());
+        if(CollUtil.isNotEmpty(projectInfo.getDynamicForm())){
+            draft.setDynamicForm(JSON.toJSONString(projectInfo.getDynamicForm()));
+        }
+        if(CollUtil.isNotEmpty(projectInfo.getApplicationList())){
+            draft.setProjectApplicationList(JSON.toJSONString(projectInfo.getApplicationList()));
+        }
         if (Objects.isNull(draft.getId())) {
             draft.setCreateOn(LocalDateTime.now());
         }

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

@@ -9,6 +9,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -286,7 +287,7 @@ public class ProjectDTO implements Serializable {
     private Integer processStatus;
 
     @ApiModelProperty("动态表单 json")
-    private String dynamicForm;
+    private Map<String,Object> dynamicForm;
 
     private Long createBy;