Browse Source

未完待续

master
yinzuomei 3 years ago
parent
commit
0be377f923
  1. 15
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java
  2. 45
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

15
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;
}

45
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、插入或更新服务记录 //3、插入或更新服务记录
IcUserDemandServiceEntity serviceEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandServiceEntity.class); IcUserDemandServiceEntity serviceEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandServiceEntity.class);
//4、设置服务方名称 //4、设置服务方名称
String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType()); ServerInfoDTO serverInfoDTO = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
if (StringUtils.isBlank(serviceName)) { if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
} }
serviceEntity.setServerName(serviceName); serviceEntity.setServerName(serverInfoDTO.getServiceName());
IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId()); IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
if (null == origin) { if (null == origin) {
@ -430,6 +430,18 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
} }
// 4、如果需求是小程序端上报的,提醒需求人,服务已指派 // 4、如果需求是小程序端上报的,提醒需求人,服务已指派
sendDemandUserHaveOrgService(entity,formDTO.getServerId(),formDTO.getServiceType()); 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 * @param serviceType
* @return * @return
*/ */
private String queryServiceName(String serverId, String serviceType) { private ServerInfoDTO queryServiceName(String serverId, String serviceType) {
String serviceName=""; String serviceName="";
String mobile="";
switch (serviceType) switch (serviceType)
{ {
case UserDemandConstant.PARTY_UNIT: case UserDemandConstant.PARTY_UNIT:
IcPartyUnitDTO partyUnitDTO=partyUnitService.get(serverId); IcPartyUnitDTO partyUnitDTO=partyUnitService.get(serverId);
serviceName=null != partyUnitDTO ? partyUnitDTO.getUnitName() : StrConstant.EPMETY_STR; serviceName=null != partyUnitDTO ? partyUnitDTO.getUnitName() : StrConstant.EPMETY_STR;
mobile = null != partyUnitDTO ? partyUnitDTO.getContactMobile() : StrConstant.EPMETY_STR;
break; break;
case UserDemandConstant.SOCIAL_ORG: case UserDemandConstant.SOCIAL_ORG:
IcSocietyOrgDTO societyOrgDTO=societyOrgService.get(serverId); IcSocietyOrgDTO societyOrgDTO=societyOrgService.get(serverId);
serviceName=null != societyOrgDTO ? societyOrgDTO.getSocietyName() : StrConstant.EPMETY_STR; serviceName=null != societyOrgDTO ? societyOrgDTO.getSocietyName() : StrConstant.EPMETY_STR;
mobile=null != societyOrgDTO ? societyOrgDTO.getMobile() : StrConstant.EPMETY_STR;
break; break;
case UserDemandConstant.COMMUNITY_ORG: case UserDemandConstant.COMMUNITY_ORG:
IcCommunitySelfOrganizationDTO dto=communitySelfOrganizationService.get(serverId); IcCommunitySelfOrganizationDTO dto=communitySelfOrganizationService.get(serverId);
serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR; serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR;
mobile = null != dto ? dto.getPrincipalPhone() : StrConstant.EPMETY_STR;
break; break;
case UserDemandConstant.VOLUNTEER: case UserDemandConstant.VOLUNTEER:
//爱心互助的志愿者 //爱心互助的志愿者
@ -461,6 +477,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常"); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
} }
serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName(); serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
mobile = userInfoRes.getData().get(NumConstant.ZERO).getMobile();
break; break;
case UserDemandConstant.IC_USER_VOLUNTEER: case UserDemandConstant.IC_USER_VOLUNTEER:
//居民信息的志愿者 ic_resi_user //居民信息的志愿者 ic_resi_user
@ -469,12 +486,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常"); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
} }
serviceName=icUserInfoRes.getData().getName(); serviceName=icUserInfoRes.getData().getName();
mobile = icUserInfoRes.getData().getMobile();
break; break;
default: default:
log.warn("serviceType 错误"); log.warn("serviceType 错误");
break; 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); operateLogDao.insert(logEntity);
//3、插入或更新服务记录 //3、插入或更新服务记录
IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId()); IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER); ServerInfoDTO serverInfoDTO=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
if (StringUtils.isBlank(serviceName)) { if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
} }
String serviceId=""; String serviceId="";
@ -1177,14 +1198,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
serviceEntity.setDemandRecId(entity.getId()); serviceEntity.setDemandRecId(entity.getId());
serviceEntity.setServiceType(UserDemandConstant.VOLUNTEER); serviceEntity.setServiceType(UserDemandConstant.VOLUNTEER);
serviceEntity.setServerId(formDTO.getUserId()); serviceEntity.setServerId(formDTO.getUserId());
serviceEntity.setServerName(serviceName); serviceEntity.setServerName(serverInfoDTO.getServiceName());
demandServiceDao.insert(serviceEntity); demandServiceDao.insert(serviceEntity);
serviceId=serviceEntity.getId(); serviceId=serviceEntity.getId();
}else{ }else{
origin.setServiceType(UserDemandConstant.VOLUNTEER); origin.setServiceType(UserDemandConstant.VOLUNTEER);
origin.setServerId(formDTO.getUserId()); origin.setServerId(formDTO.getUserId());
origin.setUpdatedBy(formDTO.getUserId()); origin.setUpdatedBy(formDTO.getUserId());
origin.setServerName(serviceName); origin.setServerName(serverInfoDTO.getServiceName());
demandServiceDao.updateById(origin); demandServiceDao.updateById(origin);
serviceId=origin.getId(); serviceId=origin.getId();
} }
@ -1556,11 +1577,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
if("ic_event".equals(formDTO.getOrigin())){ if("ic_event".equals(formDTO.getOrigin())){
IcUserDemandServiceEntity serviceEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandServiceEntity.class); IcUserDemandServiceEntity serviceEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandServiceEntity.class);
serviceEntity.setDemandRecId(demandRecId); serviceEntity.setDemandRecId(demandRecId);
String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType()); ServerInfoDTO serverInfoDTO = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
if (StringUtils.isBlank(serviceName)) { if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
} }
serviceEntity.setServerName(serviceName); serviceEntity.setServerName(serverInfoDTO.getServiceName());
demandServiceDao.insert(serviceEntity); demandServiceDao.insert(serviceEntity);
} }
return resultDto; return resultDto;

Loading…
Cancel
Save