From 265d45de8f9f0c7637db743594334f7c950973e4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 20 Jun 2022 14:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/EpmetHeartOpenFeignClient.java     |  9 ---------
 .../fallback/EpmetHeartOpenFeignClientFallback.java    | 10 ----------
 .../com/epmet/service/impl/IcPartyUnitServiceImpl.java | 10 +++-------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
index ba771344e9..f3c8430b3e 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
@@ -12,13 +12,11 @@ import com.epmet.dto.form.IcDemandFormDTO;
 import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.DemandRecId;
 import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
-import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
 import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
-import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -160,11 +158,4 @@ public interface EpmetHeartOpenFeignClient {
     @PostMapping("/heart/resi/volunteer/addVolunteer")
     Result addVolunteer(@RequestBody ResiVolunteerAuthenticateFormDTO formDTO);
 
-    /**
-     * 联建单位查询可用的服务事项列表
-     * @param formDTO
-     * @return
-     */
-    @PostMapping("/heart/serviceitem/dict-list")
-    Result<List<OptionDTO>> queryDictList(@RequestBody ServiceItemSelectFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
index 06c21b8121..10670de1ab 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
@@ -161,14 +161,4 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "addVolunteer", formDTO);
     }
 
-    /**
-     * 联建单位查询可用的服务事项列表
-     *
-     * @param formDTO
-     * @return
-     */
-    @Override
-    public Result<List<OptionDTO>> queryDictList(ServiceItemSelectFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDictList", formDTO);
-    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index f0adeed24b..91dc0baa57 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -51,7 +51,6 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcPartyUnitDao;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.OptionDTO;
@@ -207,12 +206,9 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             dto.setType(MapUtils.isNotEmpty(typeDictMap) && typeDictMap.containsKey(dto.getType()) ? typeDictMap.get(dto.getType()) : StrConstant.EPMETY_STR);
             // 服务事项
             if(CollectionUtils.isNotEmpty(dto.getServiceMatterList())){
-                ServiceItemSelectFormDTO serviceItemSelectFormDTO=new ServiceItemSelectFormDTO();
-                serviceItemSelectFormDTO.setCustomerId(entity.getCustomerId());
-                serviceItemSelectFormDTO.setType("usable");
-                Result<List<OptionDTO>> serviceMateerRes=heartOpenFeignClient.queryDictList(serviceItemSelectFormDTO);
-                if(serviceMateerRes.success()&&CollectionUtils.isNotEmpty(serviceMateerRes.getData())){
-                    Map<String,String> serviceMap=serviceMateerRes.getData().stream().collect(Collectors.toMap(OptionDTO::getValue,OptionDTO::getLabel));
+                List<OptionDTO> serviceMateerRes=icServiceItemDictService.queryDictList(entity.getCustomerId());
+                if(CollectionUtils.isNotEmpty(serviceMateerRes)){
+                    Map<String,String> serviceMap=serviceMateerRes.stream().collect(Collectors.toMap(OptionDTO::getValue,OptionDTO::getLabel));
                     List<String> serviceMatterNameList=new ArrayList<>();
                     for(String serviceMatterCode:dto.getServiceMatterList()){
                         if(MapUtils.isNotEmpty(serviceMap)&&serviceMap.containsKey(serviceMatterCode)){