申报项目 字段更新

pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java

@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.common.util;
 import cn.hutool.core.util.StrUtil;
 import com.ningdatech.basic.util.StrPool;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.NumberUtils;
 
@@ -110,9 +111,9 @@ public class BizUtils {
         return strings.stream().map(w -> "'" + w + "'").collect(Collectors.joining(StrPool.COMMA, StrPool.LEFT_BRACKET, StrPool.RIGHT_BRACKET));
     }
 
-    public static String getProjectTypeName(Integer projectType) {
+    public static String getProjectTypeName(String projectType) {
         if (Objects.nonNull(projectType)) {
-           return ProjectTypeEnum.getDesc(projectType);
+           return ProjectTypeNewEnum.getDesc(projectType);
         }
         return StringUtils.EMPTY;
     }

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/helper/DashboardChartAssembler.java

@@ -88,6 +88,23 @@ public class DashboardChartAssembler {
         return analysisChart;
     }
 
+    public static <T> AnalysisChart buildAnalysisChartString(Map<T, String> keyValueMap
+            , Map<String, List<Project>> projectGroupMap, ChartTypeEnum chartTypeEnum) {
+        AnalysisChart analysisChart = new AnalysisChart();
+        List<AnalysisData> dataList = new ArrayList<>();
+        analysisChart.setChartType(chartTypeEnum);
+        analysisChart.setDataList(dataList);
+        for (T key : keyValueMap.keySet()) {
+            AnalysisData analysisData = new AnalysisData();
+            String chartKey = keyValueMap.get(key);
+            List<Project> projectList = projectGroupMap.get(key);
+            analysisData.setKey(chartKey);
+            analysisData.setValue(CollUtil.isEmpty(projectList) ? 0 : projectList.size());
+            dataList.add(analysisData);
+        }
+        return analysisChart;
+    }
+
     public  <T> AnalysisChart assemblerAnalysisChart(Map<String, List<T>> dictionaryCodeIdMap
             , ChartTypeEnum chartTypeEnum) {
         AnalysisChart analysisChart = new AnalysisChart();

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java

@@ -199,10 +199,10 @@ public class DashboardProjectManage {
                 , ChartTypeEnum.PROJECT_SUPPLEMENTATION_STATUS_CHART);
 
         // 各类型项目数量
-        Map<Integer, List<Project>> projectTypeGroupMap = allProjectList.stream()
+        Map<String, List<Project>> projectTypeGroupMap = allProjectList.stream()
                 .collect(Collectors.groupingBy(Project::getProjectType));
         Map<Integer, String> projectTypeMap = dashboardHelper.getTemporaryAugmentMap();
-        AnalysisChart projectTypeAnalysisChart = DashboardChartAssembler.buildAnalysisChart(projectTypeMap, projectTypeGroupMap
+        AnalysisChart projectTypeAnalysisChart = DashboardChartAssembler.buildAnalysisChartString(projectTypeMap, projectTypeGroupMap
                 , ChartTypeEnum.EACH_TYPE_QUANTITY_OF_PROJECT_CHART);
 
         // 各区域项目数量

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java

@@ -38,7 +38,7 @@ public class MeetingReviewProjectVO {
     private BigDecimal declaredAmount;
 
     @ApiModelProperty("项目类型")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("申报年度")
     private Integer projectYear;

pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
 
 import com.ningdatech.pmapi.performance.model.entity.PerformanceAppraisalApplication;
@@ -72,9 +73,9 @@ public class PerformanceAppraisalConveter {
         return Collections.emptyList();
     }
 
-    public static String getProjectTypeName(Integer projectType) {
+    public static String getProjectTypeName(String projectType) {
         if (Objects.nonNull(projectType)) {
-            return ProjectTypeEnum.getDesc(projectType);
+            return ProjectTypeNewEnum.getDesc(projectType);
         }
         return StringUtils.EMPTY;
     }

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/OrgSelfAppraisalManage.java

@@ -31,6 +31,7 @@ import com.ningdatech.pmapi.portrait.model.entity.ProjectTag;
 import com.ningdatech.pmapi.portrait.service.IProjectTagService;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
 import com.ningdatech.pmapi.sys.model.entity.Role;
@@ -163,7 +164,7 @@ public class OrgSelfAppraisalManage {
                     PerformanceAppraisalProject appraisalProject = papsMap.get(p.getId());
                     BeanUtil.copyProperties(appraisalProject,vo);
                     vo.setProjectId(appraisalProject.getProjectId());
-                    vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+                    vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
                     vo.setCanSelfAppraisal(checkCanSelfAppraisal(appraisalProject));
                     vo.setAppraisalId(planId);
                     return vo;
@@ -215,7 +216,7 @@ public class OrgSelfAppraisalManage {
                     PerformanceAppraisalProject appraisalProject = papsMap.get(p.getId());
                     BeanUtil.copyProperties(appraisalProject,vo);
                     vo.setProjectId(appraisalProject.getProjectId());
-                    vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+                    vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
                     vo.setCanSelfAppraisal(checkCanSelfAppraisal(appraisalProject));
                     vo.setAppraisalId(planId);
                     return vo;
@@ -250,7 +251,7 @@ public class OrgSelfAppraisalManage {
         Project project = projectService.getProjectByCode(projectCode);
         VUtils.isTrue(Objects.isNull(project)).throwMessage("项目不存在!");
         // 根据项目类型、预算年度、批复金额、项目标签匹配本区域指标模版
-        Integer projectType = project.getProjectType();
+        String projectType = project.getProjectType();
         Integer projectYear = project.getProjectYear();
         BigDecimal approvalAmount = project.getApprovalAmount();
         VUtils.isTrue(Objects.isNull(approvalAmount)).throwMessage("未获取到该项目的立项批复金额");
@@ -390,7 +391,7 @@ public class OrgSelfAppraisalManage {
         Project project = projectService.getProjectByCode(projectCode);
         VUtils.isTrue(Objects.isNull(project)).throwMessage("项目不存在!");
         // 根据项目类型、预算年度、批复金额、项目标签匹配本区域指标模版
-        Integer projectType = project.getProjectType();
+        String projectType = project.getProjectType();
         Integer projectYear = project.getProjectYear();
         BigDecimal approvalAmount = project.getApprovalAmount();
         VUtils.isTrue(Objects.isNull(approvalAmount)).throwMessage("未获取到该项目的立项批复金额");

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 
 import com.ningdatech.pmapi.performance.model.entity.*;
 import com.ningdatech.pmapi.performance.service.*;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
@@ -1055,7 +1056,7 @@ public class PerformanceAppraisalPlanManage {
         List<PerformanceAppraisalProjectVO> voList = projects.stream().map(p -> {
             PerformanceAppraisalProjectVO appraisalProjectVo = new PerformanceAppraisalProjectVO();
             BeanUtil.copyProperties(p, appraisalProjectVo);
-            appraisalProjectVo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+            appraisalProjectVo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
             return appraisalProjectVo;
         }).collect(Collectors.toList());
         return PageVo.of(voList,voList.size());

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java

@@ -18,6 +18,7 @@ import com.ningdatech.pmapi.performance.model.req.PerformanceAppraisalExportReq;
 import com.ningdatech.pmapi.performance.util.*;
 import com.ningdatech.pmapi.portrait.model.entity.ProjectTag;
 import com.ningdatech.pmapi.portrait.service.IProjectTagService;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Component;
@@ -215,7 +216,7 @@ public class ReAppraisalManage {
                     PerformanceAppraisalProject appraisalProject = appraisalProjectMap.get(p.getProjectCode());
                     BeanUtil.copyProperties(appraisalProject, vo);
                     vo.setProjectId(appraisalProject.getProjectId());
-                    vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+                    vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
                     vo.setCanReAppraisal(checkCanReAppraisal(employeeCode,appraisalProject.getProjectCode(),appraisalId));
                     if (Boolean.TRUE.equals(appraisalProject.getIsCompleteReAppraisal())){
                         // 完成复评的项目可以进行核查
@@ -340,7 +341,7 @@ public class ReAppraisalManage {
         Project project = projectService.getProjectByCode(projectCode);
         VUtils.isTrue(Objects.isNull(project)).throwMessage("项目不存在!");
         // 根据项目类型、预算年度、批复金额、项目标签匹配本区域指标模版
-        Integer projectType = project.getProjectType();
+        String projectType = project.getProjectType();
         Integer projectYear = project.getProjectYear();
         BigDecimal approvalAmount = project.getApprovalAmount();
         VUtils.isTrue(Objects.isNull(approvalAmount)).throwMessage("未获取到该项目的立项批复金额");

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/RectifyAuditManage.java

@@ -13,6 +13,7 @@ import com.ningdatech.pmapi.performance.enumration.RectifyAuditEnum;
 import com.ningdatech.pmapi.performance.model.dto.ProjectAppraisalInfoDTO;
 import com.ningdatech.pmapi.performance.model.entity.*;
 import com.ningdatech.pmapi.performance.service.*;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -215,7 +216,7 @@ public class RectifyAuditManage {
             BeanUtil.copyProperties(appraisalProject, vo);
             vo.setProjectId(appraisalProject.getProjectId());
             vo.setProjectCode(appraisalProject.getProjectCode());
-            vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+            vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
             vo.setAppraisalId(planId);
             vo.setRectifyStatus(appraisalProject.getRectifyStatus());
             vo.setRectifyStatusName(RectifyStatusEnum.getDesc(appraisalProject.getRectifyStatus()));
@@ -286,7 +287,7 @@ public class RectifyAuditManage {
             BeanUtil.copyProperties(appraisalProject, vo);
             vo.setProjectId(appraisalProject.getProjectId());
             vo.setProjectCode(appraisalProject.getProjectCode());
-            vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+            vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
             vo.setAppraisalId(planId);
             vo.setRectifyStatus(appraisalProject.getRectifyStatus());
             vo.setRectifyStatusName(RectifyStatusEnum.getDesc(appraisalProject.getRectifyStatus()));

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/RectifyManage.java

@@ -7,6 +7,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -178,7 +179,7 @@ public class RectifyManage {
             BeanUtil.copyProperties(appraisalProject, vo);
             vo.setProjectId(appraisalProject.getProjectId());
             vo.setProjectCode(appraisalProject.getProjectCode());
-            vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+            vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
             vo.setAppraisalId(planId);
             vo.setRectifyStatus(appraisalProject.getRectifyStatus());
             vo.setRectifyStatusName(RectifyStatusEnum.getDesc(appraisalProject.getRectifyStatus()));
@@ -228,7 +229,7 @@ public class RectifyManage {
             BeanUtil.copyProperties(appraisalProject, vo);
             vo.setProjectId(appraisalProject.getProjectId());
             vo.setProjectCode(appraisalProject.getProjectCode());
-            vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+            vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
             vo.setAppraisalId(planId);
             vo.setRectifyStatus(appraisalProject.getRectifyStatus());
             vo.setRectifyStatusName(RectifyStatusEnum.getDesc(appraisalProject.getRectifyStatus()));

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/VerifyManage.java

@@ -17,6 +17,7 @@ import com.ningdatech.pmapi.performance.model.req.PerformanceAppraisalExportReq;
 import com.ningdatech.pmapi.performance.util.*;
 import com.ningdatech.pmapi.portrait.model.entity.ProjectTag;
 import com.ningdatech.pmapi.portrait.service.IProjectTagService;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -204,7 +205,7 @@ public class VerifyManage {
                     PerformanceAppraisalProject appraisalProject = appraisalProjectMap.get(p.getProjectCode());
                     BeanUtil.copyProperties(appraisalProject, vo);
                     vo.setProjectId(appraisalProject.getProjectId());
-                    vo.setProjectTypeName(ProjectTypeEnum.getDesc(p.getProjectType()));
+                    vo.setProjectTypeName(ProjectTypeNewEnum.getDesc(p.getProjectType()));
                     vo.setCanVerify(checkCanVerify(employeeCode,appraisalProject.getProjectCode(),appraisalId));
                     // 如果登录用户是核查组长，该项目可填写整改意见
                     String verifyLeader = projectGroup.getVerifyLeader();
@@ -340,7 +341,7 @@ public class VerifyManage {
         Project project = projectService.getProjectByCode(projectCode);
         VUtils.isTrue(Objects.isNull(project)).throwMessage("项目不存在!");
         // 根据项目类型、预算年度、批复金额、项目标签匹配本区域指标模版
-        Integer projectType = project.getProjectType();
+        String projectType = project.getProjectType();
         Integer projectYear = project.getProjectYear();
         BigDecimal approvalAmount = project.getApprovalAmount();
         VUtils.isTrue(Objects.isNull(approvalAmount)).throwMessage("未获取到该项目的立项批复金额");

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectVO.java

@@ -35,7 +35,7 @@ public class PerformanceAppraisalProjectVO implements Serializable {
     private String buildOrgName;
 
     @ApiModelProperty("项目类型")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("项目类型名")
     private String projectTypeName;

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

@@ -33,6 +33,7 @@ import com.ningdatech.pmapi.projectdeclared.service.IPreInsAcceptancePersonServi
 import com.ningdatech.pmapi.projectdeclared.service.IPurchaseService;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
@@ -149,7 +150,7 @@ public class ConstructionManage {
             collect = records.stream().map(r -> {
                 DeclaredProjectExportDTO exportDTO = new DeclaredProjectExportDTO();
                 BeanUtils.copyProperties(r, exportDTO);
-                exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+                exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
                 exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
                 String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
                 exportDTO.setCreateOn(createOnStr);
@@ -360,7 +361,7 @@ public class ConstructionManage {
             collect = records.stream().map(r -> {
                 DeclaredProjectExportDTO exportDTO = new DeclaredProjectExportDTO();
                 BeanUtils.copyProperties(r, exportDTO);
-                exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+                exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
                 exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
                 String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
                 exportDTO.setCreateOn(createOnStr);

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

@@ -23,6 +23,7 @@ import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq;
 import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
@@ -304,7 +305,7 @@ public class ConstructionPlanManage {
         List<ConstructionPlanExportDTO> collect = records.stream().map(r -> {
             ConstructionPlanExportDTO exportDTO = new ConstructionPlanExportDTO();
             BeanUtils.copyProperties(r, exportDTO);
-            exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+            exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
             String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
             exportDTO.setCreateOn(createOnStr);
             return exportDTO;

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

@@ -31,6 +31,7 @@ import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO;
 import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
@@ -421,7 +422,7 @@ public class DeclaredProjectManage {
         List<DeclaredProjectExportDTO> collect = records.stream().map(r -> {
             DeclaredProjectExportDTO exportDTO = new DeclaredProjectExportDTO();
             BeanUtils.copyProperties(r, exportDTO);
-            exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+            exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
             exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
             String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
             exportDTO.setCreateOn(createOnStr);

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

@@ -22,6 +22,7 @@ import com.ningdatech.pmapi.projectdeclared.model.vo.DelayedApplyVO;
 import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
@@ -178,7 +179,7 @@ public class DelayedApplyManage {
             collect = records.stream().map(r -> {
                 DeclaredProjectExportDTO exportDTO = new DeclaredProjectExportDTO();
                 BeanUtils.copyProperties(r, exportDTO);
-                exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+                exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
                 exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
                 String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
                 exportDTO.setCreateOn(createOnStr);

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

@@ -21,6 +21,7 @@ import com.ningdatech.pmapi.projectdeclared.model.vo.FinalAcceptanceVO;
 import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
@@ -145,7 +146,7 @@ public class FinalAcceptanceManage {
             collect = records.stream().map(r -> {
                 DeclaredProjectExportDTO exportDTO = new DeclaredProjectExportDTO();
                 BeanUtils.copyProperties(r, exportDTO);
-                exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+                exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
                 exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
                 String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
                 exportDTO.setCreateOn(createOnStr);

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

@@ -20,6 +20,7 @@ import com.ningdatech.pmapi.projectdeclared.model.dto.PretrialDeclaredExportDTO;
 import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
@@ -326,7 +327,7 @@ public class PrequalificationDeclaredProjectManage {
         List<PretrialDeclaredExportDTO> collect = records.stream().map(r -> {
             PretrialDeclaredExportDTO exportDTO = new PretrialDeclaredExportDTO();
             BeanUtils.copyProperties(r, exportDTO);
-            exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+            exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
             String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
             exportDTO.setCreateOn(createOnStr);
             return exportDTO;

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

@@ -20,6 +20,7 @@ import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil;
 import com.ningdatech.pmapi.projectdeclared.utils.ReStartProcessMapUtil;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
@@ -183,7 +184,7 @@ public class ProjectAdjustmentManage {
         List<ProjectAdjustmentExportDTO> collect = records.stream().map(r -> {
             ProjectAdjustmentExportDTO exportDTO = new ProjectAdjustmentExportDTO();
             BeanUtils.copyProperties(r, exportDTO);
-            exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+            exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
             exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
             String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
             exportDTO.setCreateOn(createOnStr);

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

@@ -22,6 +22,7 @@ import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO;
 import com.ningdatech.pmapi.projectdeclared.service.IPurchaseService;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
@@ -123,7 +124,7 @@ public class PurchaseManage {
         records.forEach(r -> {
             DeclaredProjectExportDTO dpe = new DeclaredProjectExportDTO();
             BeanUtils.copyProperties(r, dpe);
-            dpe.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType()));
+            dpe.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType()));
             dpe.setStatusName(ProjectStatusEnum.getDesc(r.getStatus()));
             String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm");
             dpe.setCreateOn(createOnStr);

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

@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.projectdeclared.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ningdatech.pmapi.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -51,6 +52,16 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("历年项目年度")
+    private String baseHistorProjYear;
+
+
     @ApiModelProperty("是否临时增补 0:否 1:是")
     private Integer isTemporaryAugment;
 
@@ -78,8 +89,12 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("建设单位浙政钉ID")
     private String buildOrgZheJiangGovDingId;
 
-    @ApiModelProperty("项目类型 1:建设 2:运维")
-    private Integer projectType;
+    @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
+    @Compare("项目类型")
+    private String projectType;
+
+    @ApiModelProperty("是否省级 1省级 2非省级")
+    private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;
@@ -102,12 +117,23 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("综合业务领域")
     private Integer bizDomain;
 
-    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
-    private Integer buildLevel;
+    @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("建设层级")
+    private String buildLevel;
+
+    @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("贯通层级")
+    private String lowestLevel;
 
     @ApiModelProperty("立项依据")
     private String buildBasis;
 
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
     @ApiModelProperty("发改编码")
     private String developCode;
 
@@ -305,6 +331,12 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("项目编码")
     private String projectCode;
 
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
+
     private Long createBy;
     private Long updateBy;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.model.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ningdatech.pmapi.common.compare.Compare;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -52,6 +53,18 @@ public class ProjectDraftVO implements Serializable {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("历年项目年度")
+    private String baseHistorProjYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
     @ApiModelProperty("是否临时增补 0:否 1:是")
     private Integer isTemporaryAugment;
 
@@ -79,8 +92,12 @@ public class ProjectDraftVO implements Serializable {
     @ApiModelProperty("建设单位浙政钉ID")
     private String buildOrgZheJiangGovDingId;
 
-    @ApiModelProperty("项目类型 1:建设 2:运维")
-    private Integer projectType;
+    @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
+    @Compare("项目类型")
+    private String projectType;
+
+    @ApiModelProperty("是否省级 1省级 2非省级")
+    private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;
@@ -103,12 +120,20 @@ public class ProjectDraftVO implements Serializable {
     @ApiModelProperty("综合业务领域")
     private String bizDomain;
 
-    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
-    private Integer buildLevel;
+    @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("建设层级")
+    private String buildLevel;
+
+    @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("贯通层级")
+    private String lowestLevel;
 
     @ApiModelProperty("立项依据")
     private String buildBasis;
 
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
     @ApiModelProperty("发改编码")
     private String developCode;
 
@@ -306,6 +331,12 @@ public class ProjectDraftVO implements Serializable {
     @ApiModelProperty("项目申报书")
     private String projectApplicationForm;
 
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
+
     private Long createBy;
     private Long updateBy;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectTypeNewEnum.java

@@ -0,0 +1,45 @@
+package com.ningdatech.pmapi.projectlib.enumeration;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * ProjectTypeNewEnum
+ * </p>
+ *
+ * @author Poffy
+ * @since 16:56 2023/2/11
+ */
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public enum ProjectTypeNewEnum {
+    /**
+     * 项目类型
+     */
+    FIRST_BUILD("01", "首次建设"),
+    SJ_BUILD("02", "迭代升级"),
+    SZ_BUILD("03", "结转建设"),
+    NEW_OPERA("04", "新运维"),
+    XU_OPERA("05", "续运维");
+
+    private String code;
+    private String desc;
+
+    public static String getDesc(String code) {
+        if (StringUtils.isBlank(code)) {
+            return StringUtils.EMPTY;
+        }
+        for (ProjectTypeNewEnum t : ProjectTypeNewEnum.values()) {
+            if (code.equals(t.getCode())) {
+                return t.desc;
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ningdatech.pmapi.projectlib.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ningdatech.pmapi.common.compare.Compare;
 import com.ningdatech.pmapi.performance.model.dto.ProjectCoreBusinessDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,6 +45,18 @@ public class ProjectDTO implements Serializable {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("历年项目年度")
+    private String baseHistorProjYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
     @ApiModelProperty("是否临时增补 0:否 1:是")
     private Integer isTemporaryAugment;
 
@@ -71,8 +84,12 @@ public class ProjectDTO implements Serializable {
     @ApiModelProperty("建设单位浙政钉ID")
     private String buildOrgZheJiangGovDingId;
 
-    @ApiModelProperty("项目类型 1:建设 2:运维")
-    private Integer projectType;
+    @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
+    @Compare("项目类型")
+    private String projectType;
+
+    @ApiModelProperty("是否省级 1省级 2非省级")
+    private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;
@@ -95,12 +112,20 @@ public class ProjectDTO implements Serializable {
     @ApiModelProperty("综合业务领域 1: '党政机关整体智治',2: '数字政府',3: '数字经济',4: '数字社会',7: '数字文化',5: '数字法治',6: '一体化智能化公共数据平台', 8: '基层智治'")
     private Integer bizDomain;
 
-    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
-    private Integer buildLevel;
+    @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("建设层级")
+    private String buildLevel;
+
+    @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("贯通层级")
+    private String lowestLevel;
 
     @ApiModelProperty("立项依据")
     private String buildBasis;
 
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
     @ApiModelProperty("发改编码")
     private String developCode;
 
@@ -320,4 +345,10 @@ public class ProjectDTO implements Serializable {
 
     @ApiModelProperty("是否退回|驳回的项目版本")
     private Boolean isBackReject = Boolean.FALSE;
+
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
 }

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

@@ -47,6 +47,18 @@ public class Project implements Serializable {
     @Compare("项目名称")
     private String projectName;
 
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("历年项目年度")
+    private String baseHistorProjYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
     @ApiModelProperty("是否临时增补 0:否 1:是")
     @Compare("是否临时增补")
     private Integer isTemporaryAugment;
@@ -83,9 +95,12 @@ public class Project implements Serializable {
     @Compare("建设单位浙政钉ID")
     private String buildOrgZheJiangGovDingId;
 
-    @ApiModelProperty("项目类型 1:建设 2:运维")
+    @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
     @Compare("项目类型")
-    private Integer projectType;
+    private String projectType;
+
+    @ApiModelProperty("是否省级 1省级 2非省级")
+    private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
     @Compare("是否首次新建")
@@ -115,14 +130,21 @@ public class Project implements Serializable {
     @Compare("综合业务领域")
     private Integer bizDomain;
 
-    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
+    @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
     @Compare("建设层级")
-    private Integer buildLevel;
+    private String buildLevel;
+
+    @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("贯通层级")
+    private String lowestLevel;
 
     @ApiModelProperty("立项依据")
     @Compare("立项依据")
     private String buildBasis;
 
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
     @ApiModelProperty("发改编码")
     @Compare("发改编码")
     private String developCode;
@@ -496,4 +518,9 @@ public class Project implements Serializable {
     @ApiModelProperty("是否退回|驳回的项目版本")
     private Boolean isBackReject;
 
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
 }

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

@@ -24,7 +24,7 @@ public class AnnualPlanListItemVO {
     private String buildOrg;
 
     @ApiModelProperty("项目类型")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("申报金额")
     private BigDecimal declaredAmount;

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

@@ -12,6 +12,7 @@ import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsAcceptancePersonVO;
 import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.safety.model.vo.SafetyMonitorVO;
 import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo;
 import io.swagger.annotations.ApiModel;
@@ -56,6 +57,18 @@ public class ProjectDetailVO {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
+    @ApiModelProperty("历年项目年度")
+    private String baseHistorProjYear;
+
     @ApiModelProperty("是否临时增补 0:否 1:是")
     private Integer isTemporaryAugment;
 
@@ -83,8 +96,12 @@ public class ProjectDetailVO {
     @ApiModelProperty("建设单位浙政钉ID")
     private String buildOrgZheJiangGovDingId;
 
-    @ApiModelProperty("项目类型 1:建设 2:运维")
-    private Integer projectType;
+    @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
+    @Compare("项目类型")
+    private String projectType;
+
+    @ApiModelProperty("是否省级 1省级 2非省级")
+    private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;
@@ -107,12 +124,20 @@ public class ProjectDetailVO {
     @ApiModelProperty("综合业务领域")
     private Integer bizDomain;
 
-    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
-    private Integer buildLevel;
+    @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("建设层级")
+    private String buildLevel;
+
+    @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
+    @Compare("贯通层级")
+    private String lowestLevel;
 
     @ApiModelProperty("立项依据")
     private String buildBasis;
 
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
     @ApiModelProperty("发改编码")
     private String developCode;
 
@@ -433,7 +458,7 @@ public class ProjectDetailVO {
 
     public String getProjectTypeName() {
         if (Objects.nonNull(this.projectType)) {
-            Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType))
+            Optional.ofNullable(ProjectTypeNewEnum.getDesc(this.projectType))
                     .ifPresent(desc -> this.projectTypeName = desc);
         }
         return this.projectTypeName;
@@ -467,4 +492,10 @@ public class ProjectDetailVO {
 
     @ApiModelProperty("安全风险监测信息")
     private SafetyMonitorVO safetyInfo;
+
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
 }

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

@@ -2,10 +2,12 @@ package com.ningdatech.pmapi.projectlib.model.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ningdatech.pmapi.common.compare.Compare;
 import com.ningdatech.pmapi.common.enumeration.CommonEnum;
 import com.ningdatech.pmapi.portrait.model.vo.TagVO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration;
 import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
@@ -64,8 +66,9 @@ public class ProjectLibListItemVO {
     @JSONField(format = "yyyy-MM-dd")
     private LocalDateTime approvalDate;
 
-    @ApiModelProperty("项目类型")
-    private Integer projectType;
+    @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
+    @Compare("项目类型")
+    private String projectType;
 
     @ApiModelProperty("项目阶段")
     private Integer stage;
@@ -122,7 +125,7 @@ public class ProjectLibListItemVO {
 
     public String getProjectTypeName() {
         if (Objects.nonNull(this.projectType)) {
-            Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType))
+            Optional.ofNullable(ProjectTypeNewEnum.getDesc(this.projectType))
                     .ifPresent(desc -> this.projectTypeName = desc);
         }
         return this.projectTypeName;

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

@@ -83,8 +83,7 @@ public class ProjectRenewalFundDeclarationVO implements Serializable {
     @ApiModelProperty("建设单位名称")
     private String buildOrgName;
 
-    @ApiModelProperty("项目类型 1建设 2运维")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("审核意见")
     private String auditOpinion;

pmapi/src/main/java/com/ningdatech/pmapi/provincial/model/dto/ProvincialProjectDTO.java

@@ -43,7 +43,7 @@ public class ProvincialProjectDTO implements Serializable {
     private String projectId;
 
     @ApiModelProperty("项目类型 1新建 2续建")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("项目总投资(万元)")
     private BigDecimal totalMoney;

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -1547,8 +1547,8 @@ public class TodoCenterManage {
         String isTemporaryAugment = IsOrNotEnum.getDescByCode(project.getIsTemporaryAugment());
         paramsMap.put("isTemporaryAugment", isTemporaryAugment);
         // 获取项目类型
-        Integer projectType = project.getProjectType();
-        paramsMap.put("projectType", ProjectTypeEnum.getDesc(projectType));
+        String projectType = project.getProjectType();
+        paramsMap.put("projectType", ProjectTypeNewEnum.getDesc(projectType));
         // 获取是否首次新建
         String isFirst = IsOrNotEnum.getDescByCode(project.getIsFirst());
         paramsMap.put("isFirst", isFirst);