From 93f1ef9feff590b9927ac4d2bafce3f4377aea3e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 14 Dec 2021 09:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcPartyActivityServiceImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
index 9258767df3..57fda0e82e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
@@ -154,12 +154,18 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     @Override
     public IcPartyActivityDTO get(String id) {
         IcPartyActivityEntity entity = baseDao.selectById(id);
+        //获取服务事项名称
         SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
         codeFormDTO.setCustomerId(entity.getCustomerId());
         codeFormDTO.setParentCategoryCode(SERVICE_MATTER_CODE);
         Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
         IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class);
         dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter()));
+        //获取单位名称
+        IcPartyUnitDTO unitDTO = icPartyUnitService.get(dto.getUnitId());
+        if (null != unitDTO) {
+            dto.setUnitName(unitDTO.getUnitName());
+        }
         return dto;
     }