续建项目资金 debug

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<ProjectRenewalExportDTO> 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<ProjectRenewalDeclareExportDTO> 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())) {

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;