老的项目类型

pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 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.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;
@@ -25,6 +26,8 @@ import com.ningdatech.pmapi.gov.model.req.ProjectPushReq;
 import com.ningdatech.pmapi.gov.model.vo.*;
 import com.ningdatech.pmapi.gov.service.*;
 import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import com.ningdatech.pmapi.provincial.manage.ProvincialManage;
 import com.ningdatech.pmapi.sys.model.entity.Role;
@@ -134,6 +137,13 @@ public class GovProjectCollectionManage {
                 .eq(StringUtils.isNotBlank(req.getRegionCode()),GovBizProjectBaseinfo::getBaseAreaCode,req.getRegionCode() + BizConst.NINE_AREA_CODE_LAST)
                 .gt(Objects.nonNull(req.getCreateOnMin()),GovBizProjectBaseinfo::getTongTime,req.getCreateOnMin())
                 .le(Objects.nonNull(req.getCreateOnMax()),GovBizProjectBaseinfo::getTongTime,req.getCreateOnMax())
+                .eq(StringUtils.isNotBlank(req.getProjectType()),GovBizProjectBaseinfo::getBaseProjType,req.getProjectType())
+                .in(Objects.nonNull(req.getOldProjectType()) && ProjectTypeEnum.BUILD.getCode().equals(req.getOldProjectType()),
+                        GovBizProjectBaseinfo::getBaseProjType, Lists.newArrayList(ProjectTypeNewEnum.FIRST_BUILD.getCode(),
+                                ProjectTypeNewEnum.SJ_BUILD.getCode(),ProjectTypeNewEnum.SZ_BUILD.getCode()))
+                .in(Objects.nonNull(req.getOldProjectType()) && ProjectTypeEnum.DEV_OPS.getCode().equals(req.getOldProjectType()),
+                        GovBizProjectBaseinfo::getBaseProjType, Lists.newArrayList(ProjectTypeNewEnum.NEW_OPERA.getCode(),
+                                ProjectTypeNewEnum.XU_OPERA.getCode()))
                 .eq(GovBizProjectBaseinfo::getDeleted,Boolean.FALSE)
                 .orderByDesc(GovBizProjectBaseinfo::getBizTime);
 //        permissions(wrapper);
@@ -191,6 +201,13 @@ public class GovProjectCollectionManage {
                 .eq(StringUtils.isNotBlank(req.getRegionCode()),GovBizProjectDraft::getBaseAreaCode,req.getRegionCode() + BizConst.NINE_AREA_CODE_LAST)
                 .gt(Objects.nonNull(req.getCreateOnMin()),GovBizProjectDraft::getTongTime,req.getCreateOnMin())
                 .le(Objects.nonNull(req.getCreateOnMax()),GovBizProjectDraft::getTongTime,req.getCreateOnMax())
+                .eq(StringUtils.isNotBlank(req.getProjectType()),GovBizProjectDraft::getBaseProjType,req.getProjectType())
+                .in(Objects.nonNull(req.getOldProjectType()) && ProjectTypeEnum.BUILD.getCode().equals(req.getOldProjectType()),
+                        GovBizProjectDraft::getBaseProjType, Lists.newArrayList(ProjectTypeNewEnum.FIRST_BUILD.getCode(),
+                                ProjectTypeNewEnum.SJ_BUILD.getCode(),ProjectTypeNewEnum.SZ_BUILD.getCode()))
+                .in(Objects.nonNull(req.getOldProjectType()) && ProjectTypeEnum.DEV_OPS.getCode().equals(req.getOldProjectType()),
+                        GovBizProjectDraft::getBaseProjType, Lists.newArrayList(ProjectTypeNewEnum.NEW_OPERA.getCode(),
+                                ProjectTypeNewEnum.XU_OPERA.getCode()))
                 .eq(GovBizProjectDraft::getDeleted,Boolean.FALSE)
                 .eq(GovBizProjectDraft::getCreateId,user.getUserId())
                 .orderByDesc(GovBizProjectDraft::getBizTime);

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

@@ -1069,7 +1069,7 @@ public class PerformanceAppraisalPlanManage {
         Long appraisalId = req.getAppraisalId();
         String projectName = req.getProjectName();
         String buildOrgName = req.getBuildOrgName();
-        Integer projectType = req.getProjectType();
+        String projectType = req.getProjectType();
         Integer projectYear = req.getProjectYear();
         // 从项目库获取本区域已验收的项目列表
         ProjectListReq param = new ProjectListReq();

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/req/PerformanceAppraisalListReq.java

@@ -50,7 +50,7 @@ public class PerformanceAppraisalListReq extends PagePo {
     private Long appraisalId;
 
     @ApiModelProperty("项目类型")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("预算年度")
     private Integer projectYear;

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java

@@ -51,8 +51,11 @@ public class ProjectListReq extends PagePo {
     @ApiModelProperty("主管单位code")
     private String superOrgCode;
 
+    @ApiModelProperty("项目类型 老的 1建设2运维")
+    private Integer oldProjectType;
+
     @ApiModelProperty("项目类型")
-    private Integer projectType;
+    private String projectType;
 
     @ApiModelProperty("预算年度")
     private Integer projectYear;