From 0be377f923c7285d53621130b768573de269cda7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 27 Jul 2022 16:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=BE=85=E7=BB=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/entity/ServerInfoDTO.java  | 15 +++++++
 .../impl/IcUserDemandRecServiceImpl.java      | 45 ++++++++++++++-----
 2 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java
new file mode 100644
index 0000000000..39bdd462f5
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java
@@ -0,0 +1,15 @@
+package com.epmet.entity;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/27 16:23
+ */
+@Data
+public class ServerInfoDTO {
+    private String serviceName;
+    private String mobile;
+}
+
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 c1acbcd859..9458f5ddff 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
@@ -414,11 +414,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         //3、插入或更新服务记录
         IcUserDemandServiceEntity serviceEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandServiceEntity.class);
         //4、设置服务方名称
-        String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
-        if (StringUtils.isBlank(serviceName)) {
+        ServerInfoDTO serverInfoDTO = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
+        if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
         }
-        serviceEntity.setServerName(serviceName);
+        serviceEntity.setServerName(serverInfoDTO.getServiceName());
 
         IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
         if (null == origin) {
@@ -430,6 +430,18 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         // 4、如果需求是小程序端上报的，提醒需求人，服务已指派
         sendDemandUserHaveOrgService(entity,formDTO.getServerId(),formDTO.getServiceType());
+        //给服务方负责人发短信
+        sendPhoneMsgToServer(formDTO.getUserId(),serverInfoDTO.getMobile());
+    }
+
+    /**
+     * 需求指派后给社区自组织、联建单位、志愿者发短信通知
+     * @param staffId
+     * @param mobile
+     */
+    private void sendPhoneMsgToServer(String staffId, String mobile) {
+        // XXX社区给您指派了一个新的需求，请查看
+        // todo
     }
 
     /**
@@ -438,21 +450,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      * @param serviceType
      * @return
      */
-    private String queryServiceName(String serverId, String serviceType) {
+    private ServerInfoDTO queryServiceName(String serverId, String serviceType) {
         String serviceName="";
+        String mobile="";
         switch (serviceType)
         {
             case UserDemandConstant.PARTY_UNIT:
                 IcPartyUnitDTO partyUnitDTO=partyUnitService.get(serverId);
                 serviceName=null != partyUnitDTO ? partyUnitDTO.getUnitName() : StrConstant.EPMETY_STR;
+                mobile = null != partyUnitDTO ? partyUnitDTO.getContactMobile() : StrConstant.EPMETY_STR;
                 break;
             case UserDemandConstant.SOCIAL_ORG:
                 IcSocietyOrgDTO societyOrgDTO=societyOrgService.get(serverId);
                 serviceName=null != societyOrgDTO ? societyOrgDTO.getSocietyName() : StrConstant.EPMETY_STR;
+                mobile=null != societyOrgDTO ? societyOrgDTO.getMobile() : StrConstant.EPMETY_STR;
                 break;
             case UserDemandConstant.COMMUNITY_ORG:
                 IcCommunitySelfOrganizationDTO dto=communitySelfOrganizationService.get(serverId);
                 serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR;
+                mobile = null != dto ? dto.getPrincipalPhone() : StrConstant.EPMETY_STR;
                 break;
             case UserDemandConstant.VOLUNTEER:
                 //爱心互助的志愿者
@@ -461,6 +477,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                     throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
                 }
                 serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
+                mobile = userInfoRes.getData().get(NumConstant.ZERO).getMobile();
                 break;
             case UserDemandConstant.IC_USER_VOLUNTEER:
                 //居民信息的志愿者 ic_resi_user
@@ -469,12 +486,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                     throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
                 }
                 serviceName=icUserInfoRes.getData().getName();
+                mobile = icUserInfoRes.getData().getMobile();
                 break;
             default:
                 log.warn("serviceType 错误");
                 break;
         }
-        return serviceName;
+        ServerInfoDTO serverInfoDTO=new ServerInfoDTO();
+        serverInfoDTO.setServiceName(serviceName);
+        serverInfoDTO.setMobile(mobile);
+        return serverInfoDTO;
     }
 
     /**
@@ -1166,8 +1187,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         operateLogDao.insert(logEntity);
         //3、插入或更新服务记录
         IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
-        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
-        if (StringUtils.isBlank(serviceName)) {
+        ServerInfoDTO serverInfoDTO=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
+        if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
         }
         String serviceId="";
@@ -1177,14 +1198,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             serviceEntity.setDemandRecId(entity.getId());
             serviceEntity.setServiceType(UserDemandConstant.VOLUNTEER);
             serviceEntity.setServerId(formDTO.getUserId());
-            serviceEntity.setServerName(serviceName);
+            serviceEntity.setServerName(serverInfoDTO.getServiceName());
             demandServiceDao.insert(serviceEntity);
             serviceId=serviceEntity.getId();
         }else{
             origin.setServiceType(UserDemandConstant.VOLUNTEER);
             origin.setServerId(formDTO.getUserId());
             origin.setUpdatedBy(formDTO.getUserId());
-            origin.setServerName(serviceName);
+            origin.setServerName(serverInfoDTO.getServiceName());
             demandServiceDao.updateById(origin);
             serviceId=origin.getId();
         }
@@ -1556,11 +1577,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if("ic_event".equals(formDTO.getOrigin())){
             IcUserDemandServiceEntity serviceEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandServiceEntity.class);
             serviceEntity.setDemandRecId(demandRecId);
-            String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
-            if (StringUtils.isBlank(serviceName)) {
+            ServerInfoDTO serverInfoDTO = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
+            if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
             }
-            serviceEntity.setServerName(serviceName);
+            serviceEntity.setServerName(serverInfoDTO.getServiceName());
             demandServiceDao.insert(serviceEntity);
         }
         return resultDto;