From a8077e71869bddb47da2e52207f24b87c1c0464d Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Sat, 7 Oct 2023 17:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E5=BB=BA=E9=A1=B9=E7=9B=AE=E8=B5=84?= =?UTF-8?q?=E9=87=91=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java | 5 +++-- .../pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java index f372820..61f0dcd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java @@ -26,6 +26,7 @@ import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectRenewalDeclareExpor import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; 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.dto.ProjectRenewalExportDTO; import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; import com.ningdatech.pmapi.projectlib.model.entity.Project; @@ -373,7 +374,7 @@ public class ProjectRenewalFundManage { List collect = records.stream().map(r -> { ProjectRenewalExportDTO exportDTO = new ProjectRenewalExportDTO(); BeanUtils.copyProperties(r, exportDTO); - exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); + exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType())); if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); } else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { @@ -415,7 +416,7 @@ public class ProjectRenewalFundManage { List collect = records.stream().map(r -> { ProjectRenewalDeclareExportDTO exportDTO = new ProjectRenewalDeclareExportDTO(); BeanUtils.copyProperties(r, exportDTO); - exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); + exportDTO.setProjectTypeName(ProjectTypeNewEnum.getDesc(r.getProjectType())); if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); } else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java index 2a7de46..1bac08f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java @@ -73,7 +73,7 @@ public class ProjectRenewalFundDeclarationPO implements Serializable { private String regionCode; @ApiModelProperty("项目类型") - private Integer projectType; + private String projectType; @ApiModelProperty("建设单位名称") private String buildOrgName;