From 28ff0d820b5a2b7f3ff7e87fe49c03d5ae11e7e1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Jun 2022 11:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E7=BB=99=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=98=AF=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=8C=E7=9A=84=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/constant/UserDemandConstant.java | 4 +++-
 .../epmet/service/impl/IcUserDemandRecServiceImpl.java   | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
index 2f449f9201..2f9fa07fac 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
@@ -47,11 +47,13 @@ public interface UserDemandConstant {
     String EVALUATE="evaluate";
 
 //    服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+
+    //volunteer是指的居民信息的志愿者
     String VOLUNTEER="volunteer";
     String SOCIAL_ORG="social_org";
     String COMMUNITY_ORG="community_org";
     String PARTY_UNIT="party_unit";
-
+    String EPMET_USER_VOLUNTEER="epmet_user_volunteer";
 
     /**
      * 个人档案：personal-data
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 2d04bec434..e4a5eb348f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -430,6 +430,13 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR;
                 break;
             case UserDemandConstant.VOLUNTEER:
+                Result<IcResiUserDTO> icUserInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(serverId);
+                if (!icUserInfoRes.success() || null!=icUserInfoRes.getData()) {
+                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
+                }
+                serviceName=icUserInfoRes.getData().getName();
+                break;
+            case UserDemandConstant.EPMET_USER_VOLUNTEER:
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(serverId));
                 if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) {
                     throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询志愿者信息异常","志愿者信息查询异常");
@@ -1103,7 +1110,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         operateLogDao.insert(logEntity);
         //3、插入或更新服务记录
         IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
-        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
+        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.EPMET_USER_VOLUNTEER);
         if (StringUtils.isBlank(serviceName)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
         }