ic_user_demand_service添加server_name；指派和接单接口赋值

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcUserDemandServiceDTO.java

@@ -59,6 +59,11 @@ public class IcUserDemandServiceDTO implements Serializable {
      */
 	private String serverId;
 
+    /**
+     * 服务方姓名
+     */
+    private String serverName;
+
     /**
      * 实际服务开始时间
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandServiceEntity.java

@@ -58,6 +58,11 @@ public class IcUserDemandServiceEntity extends BaseEpmetEntity {
      */
 	private String serverId;
 
+	/**
+	 * 服务方姓名
+	 */
+	private String serverName;
+
     /**
      * 实际服务开始时间
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java

@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.IcSocietyOrgDTO;
 import com.epmet.dto.form.AddSocietyOrgFormDTO;
 import com.epmet.dto.form.EditSocietyOrgFormDTO;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
@@ -76,4 +77,6 @@ public interface IcSocietyOrgService extends BaseService<IcSocietyOrgEntity> {
     List<Integer> importExcel(String customerId, List<IcSocietyOrgExcel> list, String staffId, List<Integer> numList) throws ParseException;
 
     List<IcSocietyOrgEntity> queryListById(List<String> socialOrgIds);
+
+    IcSocietyOrgDTO get(String id);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java

@@ -278,4 +278,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
         return Collections.EMPTY_LIST;
     }
 
+    @Override
+    public IcSocietyOrgDTO get(String id) {
+        IcSocietyOrgEntity entity=baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity,IcSocietyOrgDTO.class);
+    }
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -106,10 +106,6 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
     private String textSyncScanMethod;
-    @Autowired
-    private IcUserDemandSatisfactionService icUserDemandSatisfactionService;
-    @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 
     @Override
@@ -389,6 +385,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         operateLogDao.insert(logEntity);
         //3、插入或更新服务记录
         IcUserDemandServiceEntity serviceEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandServiceEntity.class);
+        //4、设置服务方名称
+        String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
+        if (StringUtils.isBlank(serviceName)) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
+        }
         IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
         if (null == origin) {
             demandServiceDao.insert(serviceEntity);
@@ -401,6 +402,42 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         sendDemandUserHaveOrgService(entity,formDTO.getServerId(),formDTO.getServiceType());
     }
 
+    /**
+     * 获取服务方姓名
+     * @param serverId
+     * @param serviceType
+     * @return
+     */
+    private String queryServiceName(String serverId, String serviceType) {
+        String serviceName="";
+        switch (serviceType)
+        {
+            case UserDemandConstant.PARTY_UNIT:
+                IcPartyUnitDTO partyUnitDTO=partyUnitService.get(serverId);
+                serviceName=null != partyUnitDTO ? partyUnitDTO.getUnitName() : StrConstant.EPMETY_STR;
+                break;
+            case UserDemandConstant.SOCIAL_ORG:
+                IcSocietyOrgDTO societyOrgDTO=societyOrgService.get(serverId);
+                serviceName=null != societyOrgDTO ? societyOrgDTO.getSocietyName() : StrConstant.EPMETY_STR;
+                break;
+            case UserDemandConstant.COMMUNITY_ORG:
+                IcCommunitySelfOrganizationDTO dto=communitySelfOrganizationService.get(serverId);
+                serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR;
+                break;
+            case UserDemandConstant.VOLUNTEER:
+                Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(serverId));
+                if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) {
+                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询志愿者信息异常","志愿者信息查询异常");
+                }
+                serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
+                break;
+            default:
+                log.warn("serviceType 错误");
+                break;
+        }
+        return serviceName;
+    }
+
     /**
      * 完成并评价
      *
@@ -1031,6 +1068,10 @@ 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)) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
+        }
         String serviceId="";
         if (null == origin) {
             IcUserDemandServiceEntity serviceEntity=new IcUserDemandServiceEntity();
@@ -1038,12 +1079,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             serviceEntity.setDemandRecId(entity.getId());
             serviceEntity.setServiceType(UserDemandConstant.VOLUNTEER);
             serviceEntity.setServerId(formDTO.getUserId());
+            serviceEntity.setServerName(serviceName);
             demandServiceDao.insert(serviceEntity);
             serviceId=serviceEntity.getId();
         }else{
             origin.setServiceType(UserDemandConstant.VOLUNTEER);
             origin.setServerId(formDTO.getUserId());
             origin.setUpdatedBy(formDTO.getUserId());
+            origin.setServerName(serviceName);
             demandServiceDao.updateById(origin);
             serviceId=origin.getId();
         }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.7__service_name.sql

@@ -0,0 +1 @@
+alter table ic_user_demand_service add COLUMN SERVER_NAME  varchar(64) comment '服务方名称' after SERVER_ID;