From 9da5b3380e73ee4945129cd55294e6a04eda5b4d Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 28 Mar 2023 17:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=94=B9vo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java | 2 ++ .../com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java index 1b56480..3b4c238 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java @@ -315,6 +315,7 @@ public class DeclaredProjectManage { List res = page.getRecords().stream().map(record -> { ProjectDraftVO vo = new ProjectDraftVO(); BeanUtils.copyProperties(record, vo); + vo.setBizDomain(Objects.nonNull(record.getBizDomain()) ? String.valueOf(record.getBizDomain()) : StringUtils.EMPTY); return vo; }).collect(Collectors.toList()); return PageVo.of(res, page.getTotal()); @@ -324,6 +325,7 @@ public class DeclaredProjectManage { ProjectDraft draft = projectDraftService.getById(id); ProjectDraftVO vo = new ProjectDraftVO(); BeanUtils.copyProperties(draft, vo); + vo.setBizDomain(Objects.nonNull(draft.getBizDomain()) ? String.valueOf(draft.getBizDomain()) : StringUtils.EMPTY); if(StringUtils.isNotBlank(draft.getProjectApplicationList())){ vo.setApplicationList(JSON.parseArray(draft.getProjectApplicationList(),ProjectApplication.class)); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java index b9d6f71..6ac564d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java @@ -101,7 +101,7 @@ public class ProjectDraftVO implements Serializable { private Integer isDigitalReform; @ApiModelProperty("综合业务领域") - private Integer bizDomain; + private String bizDomain; @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇") private Integer buildLevel;