From 0b32de19b356ee6767205eb078ab395318fadeed Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 24 Oct 2024 15:40:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/basic/domain/BmProject.java | 5 ++++- .../material/basic/service/impl/BmProjectServiceImpl.java | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java index b11e7c2f..3b119202 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java @@ -48,10 +48,13 @@ public class BmProject extends BaseEntity private String proTypeId; @ApiModelProperty(value = "实施单位") - @Excel(name = "实施单位") @NotBlank(message = "实施单位不能为空") private String impUnit; + @ApiModelProperty(value = "实施单位") + @Excel(name = "实施单位") + private String impUnitName; + @ApiModelProperty(value = "工程类型") @Excel(name = "工程类型") @NotBlank(message = "工程类型不能为空") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java index 1a220de9..b3b13e46 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java @@ -55,10 +55,13 @@ public class BmProjectServiceImpl implements IBmProjectService { BmProject project = bmProjectMapper.selectBmProjectByProId(proId); extractedImpUnit(project); - extracted(project); return project; } + /** + * 实施单位方法抽取 + * @param project + */ private void extractedImpUnit(BmProject project) { try { AjaxResult ajaxResult = remoteDeptService.getInfo(Long.parseLong(project.getImpUnit()), SecurityConstants.INNER); @@ -70,7 +73,7 @@ public class BmProjectServiceImpl implements IBmProjectService objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); if (rawDataList != null) { SysDept sysDept = objectMapper.convertValue(rawDataList, SysDept.class); - project.setImpUnit(sysDept.getDeptName() == null ? "" : sysDept.getDeptName()); + project.setImpUnitName(sysDept.getDeptName() == null ? "" : sysDept.getDeptName()); } } } catch (NumberFormatException e) {