From 3256f76f3272dc692c3cc6f37e0944eaf21e7d40 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 3 Mar 2022 15:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/resi/ResiActDetailResultDTO.java   |  4 ++
 .../service/impl/ActInfoServiceImpl.java      | 39 +++++++++++++------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
index a232ebdf33..aa33f41e69 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
@@ -186,6 +186,8 @@ public class ResiActDetailResultDTO implements Serializable {
      */
     private String unitId;
     private String unitName;
+    private List<String> unitIdList;
+    private List<String> unitNameList;
     /**
      * 活动目标
      */
@@ -196,4 +198,6 @@ public class ResiActDetailResultDTO implements Serializable {
      */
     private String serviceMatter;
     private String serviceMatterName;
+    private List<String> serviceMatterList;
+    private List<String> serviceMatterNameList;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index e595bdd0c6..407cb74dac 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -34,6 +33,7 @@ import com.epmet.dao.ActInfoDao;
 import com.epmet.dao.ActUserRelationDao;
 import com.epmet.dao.HeartUserInfoDao;
 import com.epmet.dto.ActInfoDTO;
+import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.resi.*;
 import com.epmet.dto.result.demand.OptionDTO;
@@ -42,7 +42,6 @@ import com.epmet.entity.ActInfoEntity;
 import com.epmet.entity.ActUserRelationEntity;
 import com.epmet.service.*;
 import com.epmet.utils.CaculateDistance;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -77,6 +76,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     private IcPartyUnitService icPartyUnitService;
     @Resource
     private IcServiceItemDictService icServiceItemDictService;
+    @Resource
+    private IcPartyActivityService icPartyActivityService;
+    @Resource
+    private IcActivityServiceRelationService icActivityServiceRelationService;
+    @Resource
+    private IcActivityUnitRelationService icActivityUnitRelationService;
 
     @Override
     public PageData<ActInfoDTO> page(Map<String, Object> params) {
@@ -255,16 +260,26 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         String currentUserStatus = getCurrentUserStatus(formDto.getActId(), formDto.getUserId());
         detailResultDTO.setCurrentUserStatus(currentUserStatus);
 
-        if (StringUtils.isNotBlank(detailResultDTO.getServiceMatter())) {
-            //获取服务事项
-            List<OptionDTO> serviceItemList=icServiceItemDictService.queryDictList(tokenDto.getCustomerId());
-            Map<String, String> categoryMap=serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
-            detailResultDTO.setServiceMatterName(MapUtils.isNotEmpty(categoryMap) && categoryMap.containsKey(detailResultDTO.getServiceMatter()) ? categoryMap.get(detailResultDTO.getServiceMatter()) : StrConstant.EPMETY_STR);
-        }
-        if (StringUtils.isNotBlank(detailResultDTO.getUnitId())) {
-            //获取单位名称
-            IcPartyUnitDTO unitDTO = icPartyUnitService.get(detailResultDTO.getUnitId());
-            detailResultDTO.setUnitName(null != unitDTO ? unitDTO.getUnitName() : StrConstant.EPMETY_STR);
+        if (ActConstant.PARTY.equals(detailResultDTO.getActType())) {
+            IcPartyActivityDTO dto = icPartyActivityService.getActivityByActId(formDto.getActId());
+            if (null != dto) {
+                //获取服务事项
+                List<OptionDTO> serviceItemList = icServiceItemDictService.queryDictList(tokenDto.getCustomerId());
+                Map<String, String> categoryMap = serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+                List<String> services = icActivityServiceRelationService.getServiceList(dto.getId());
+                List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
+                detailResultDTO.setServiceMatterList(services);
+                detailResultDTO.setServiceMatterNameList(serviceNames);
+
+                //获取联建单位
+                IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
+                unitDTO.setAgencyId(dto.getAgencyId());
+                Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+                List<String> unitIds = icActivityUnitRelationService.getUnitList(dto.getId());
+                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
+                detailResultDTO.setUnitIdList(unitIds);
+                detailResultDTO.setUnitNameList(unitNames);
+            }
         }
         return new Result<ResiActDetailResultDTO>().ok(detailResultDTO);
     }