|
|
|
@ -25,13 +25,16 @@ import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.commons.tools.constant.ServiceConstant; |
|
|
|
import com.epmet.commons.tools.constant.StrConstant; |
|
|
|
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; |
|
|
|
import com.epmet.commons.tools.enums.DemandAnalysisLegendEnum; |
|
|
|
import com.epmet.commons.tools.enums.DictTypeEnum; |
|
|
|
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|
|
|
import com.epmet.commons.tools.exception.EpmetException; |
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
|
import com.epmet.commons.tools.feign.ResultDataResolver; |
|
|
|
import com.epmet.commons.tools.page.PageData; |
|
|
|
import com.epmet.commons.tools.redis.common.CustomerOrgRedis; |
|
|
|
import com.epmet.commons.tools.redis.common.CustomerStaffRedis; |
|
|
|
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; |
|
|
|
import com.epmet.commons.tools.scan.param.TextScanParamDTO; |
|
|
|
import com.epmet.commons.tools.scan.param.TextTaskDTO; |
|
|
|
import com.epmet.commons.tools.scan.result.SyncScanResult; |
|
|
|
@ -260,6 +263,10 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
} else { |
|
|
|
formDTO.setGridPids(staffInfo.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfo.getAgencyId())); |
|
|
|
} |
|
|
|
//服务方=志愿者的，查询的是居民信息的志愿者+爱心互助的志愿者服务的
|
|
|
|
if(UserDemandConstant.IC_USER_VOLUNTEER.equals(formDTO.getServiceType())){ |
|
|
|
formDTO.setServiceType(UserDemandConstant.VOLUNTEER); |
|
|
|
} |
|
|
|
PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(), |
|
|
|
formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageSelect(formDTO)); |
|
|
|
List<DemandRecResultDTO> list=pageInfo.getList(); |
|
|
|
@ -275,18 +282,22 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
List<IcResiDemandDictEntity> dictList=demandDictService.listByCodes(formDTO.getCustomerId(),categoryCodes); |
|
|
|
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); |
|
|
|
|
|
|
|
//3、查询志愿者
|
|
|
|
//3、查询爱心互助志愿者
|
|
|
|
// 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
|
|
|
|
Map<String,String> userInfoMap=new HashMap<>(); |
|
|
|
Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); |
|
|
|
if(CollectionUtils.isNotEmpty(userIdList)){ |
|
|
|
Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList)); |
|
|
|
if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){ |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"查询志愿者信息异常"); |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"查询爱心互助志愿者信息异常"); |
|
|
|
} |
|
|
|
userInfoMap=userInfoRes.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, UserBaseInfoResultDTO::getRealName)); |
|
|
|
} |
|
|
|
|
|
|
|
//4、居民信息的志愿者
|
|
|
|
Set<String> icUserIdList = list.stream().filter(item -> null != item.getServiceType() && item.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); |
|
|
|
Map<String, IcResiUserDTO> icUserInfoMap =getIcVolunteerMap(icUserIdList); |
|
|
|
|
|
|
|
//查询字典表
|
|
|
|
Result<Map<String, String>> reportTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); |
|
|
|
Map<String,String> reportTypeMap=reportTypeRes.success()&& MapUtils.isNotEmpty(reportTypeRes.getData())?reportTypeRes.getData():new HashMap<>(); |
|
|
|
@ -306,15 +317,29 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
res.setCategoryName(dictMap.get(res.getCategoryCode())); |
|
|
|
} |
|
|
|
res.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(), res.getFirstCategoryCode())); |
|
|
|
if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) { |
|
|
|
res.setServiceName(userInfoMap.get(res.getServerId())); |
|
|
|
//爱心互助志愿者
|
|
|
|
if(res.getServiceType().equals(UserDemandConstant.VOLUNTEER)){ |
|
|
|
if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) { |
|
|
|
res.setServiceName(userInfoMap.get(res.getServerId())); |
|
|
|
} |
|
|
|
} |
|
|
|
//居民信息志愿者
|
|
|
|
if(res.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)){ |
|
|
|
if (null != icUserInfoMap && icUserInfoMap.containsKey(res.getServerId())) { |
|
|
|
res.setServiceName(icUserInfoMap.get(res.getServerId()).getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
|
|
|
|
res.setReportTypeName(reportTypeMap.containsKey(res.getReportType())?reportTypeMap.get(res.getReportType()):StrConstant.EPMETY_STR); |
|
|
|
//待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
|
|
|
|
res.setStatusName(statusMap.containsKey(res.getStatus())?statusMap.get(res.getStatus()):StrConstant.EPMETY_STR); |
|
|
|
//服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
|
|
|
|
res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR); |
|
|
|
if (serviceTypeMap.containsKey(res.getServiceType())) { |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")")); |
|
|
|
} else if (res.getServiceType().equals(UserDemandConstant.VOLUNTEER)) { |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(").concat("志愿者").concat(")")); |
|
|
|
} |
|
|
|
res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId()) ? true : false); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -430,12 +455,21 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
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(), "查询志愿者信息异常","志愿者信息查询异常"); |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常"); |
|
|
|
} |
|
|
|
serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName(); |
|
|
|
break; |
|
|
|
case UserDemandConstant.IC_USER_VOLUNTEER: |
|
|
|
//居民信息的志愿者 ic_resi_user
|
|
|
|
Result<IcResiUserDTO> icUserInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(serverId); |
|
|
|
if (!icUserInfoRes.success() || null==icUserInfoRes.getData()) { |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常"); |
|
|
|
} |
|
|
|
serviceName=icUserInfoRes.getData().getName(); |
|
|
|
break; |
|
|
|
default: |
|
|
|
log.warn("serviceType 错误"); |
|
|
|
break; |
|
|
|
@ -633,9 +667,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
List<String> userIdList = Arrays.asList(res.getServerId()); |
|
|
|
Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); |
|
|
|
if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) { |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询志愿者信息异常"); |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常"); |
|
|
|
} |
|
|
|
res.setServiceName(userInfoRes.getData().get(NumConstant.ZERO).getRealName()); |
|
|
|
}else if(UserDemandConstant.IC_USER_VOLUNTEER.equals(res.getServiceType())){ |
|
|
|
// 如果服务方是居民信息的志愿者，需要查询ic_resi_user.姓名
|
|
|
|
Result<IcResiUserDTO> userInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(res.getServerId()); |
|
|
|
if (!userInfoRes.success() || null == userInfoRes.getData()) { |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); |
|
|
|
} |
|
|
|
res.setServiceName(userInfoRes.getData().getName()); |
|
|
|
} |
|
|
|
//查询字典表
|
|
|
|
Result<Map<String, String>> reportTypeRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); |
|
|
|
@ -654,7 +695,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
res.setStatusName(statusMap.containsKey(res.getStatus()) ? statusMap.get(res.getStatus()) : StrConstant.EPMETY_STR); |
|
|
|
|
|
|
|
//服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
|
|
|
|
res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR); |
|
|
|
if (serviceTypeMap.containsKey(res.getServiceType())) { |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")")); |
|
|
|
} else if (res.getServiceType().equals(UserDemandConstant.VOLUNTEER)) { |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(").concat("志愿者").concat(")")); |
|
|
|
} |
|
|
|
res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())); |
|
|
|
} |
|
|
|
return res; |
|
|
|
@ -838,7 +883,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
List<IcResiDemandDictEntity> dictList=demandDictService.listByCodes(customerId,categoryCodes); |
|
|
|
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); |
|
|
|
|
|
|
|
//3、查询志愿者
|
|
|
|
//3、查询爱心互助志愿者
|
|
|
|
// 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
|
|
|
|
Map<String,String> userInfoMap=new HashMap<>(); |
|
|
|
Set<String> userIdList=demandList.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); |
|
|
|
@ -850,6 +895,10 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
userInfoMap=userInfoRes.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, UserBaseInfoResultDTO::getRealName)); |
|
|
|
} |
|
|
|
|
|
|
|
//4、居民信息的志愿者
|
|
|
|
Set<String> icUserIdList = demandList.stream().filter(item -> null != item.getServiceType() && item.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); |
|
|
|
Map<String, IcResiUserDTO> icUserInfoMap=getIcVolunteerMap(icUserIdList); |
|
|
|
|
|
|
|
for(DemandRecResultDTO res:demandList){ |
|
|
|
if (null != gridInfoMap && gridInfoMap.containsKey(res.getGridId())) { |
|
|
|
res.setGridName(gridInfoMap.get(res.getGridId()).getGridName()); |
|
|
|
@ -859,9 +908,6 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
res.setCategoryName(dictMap.get(res.getCategoryCode())); |
|
|
|
} |
|
|
|
res.setFirstCategoryName(demandDictService.getCategoryName(customerId, res.getFirstCategoryCode())); |
|
|
|
if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) { |
|
|
|
res.setServiceName(userInfoMap.get(res.getServerId())); |
|
|
|
} |
|
|
|
//社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
|
|
|
|
//待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
|
|
|
|
//服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
|
|
|
|
@ -877,6 +923,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(社区自组织)")); |
|
|
|
break; |
|
|
|
case UserDemandConstant.VOLUNTEER: |
|
|
|
if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) { |
|
|
|
res.setServiceName(userInfoMap.get(res.getServerId())); |
|
|
|
} |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(志愿者)")); |
|
|
|
break; |
|
|
|
case UserDemandConstant.IC_USER_VOLUNTEER: |
|
|
|
if (null != icUserInfoMap && icUserInfoMap.containsKey(res.getServerId())) { |
|
|
|
res.setServiceName(icUserInfoMap.get(res.getServerId()).getName()); |
|
|
|
} |
|
|
|
res.setServiceShowName(res.getServiceName().concat("(志愿者)")); |
|
|
|
break; |
|
|
|
default: |
|
|
|
@ -900,36 +955,44 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
SubCodeFormDTO subCodeFormDTO=new SubCodeFormDTO(); |
|
|
|
subCodeFormDTO.setCustomerId(formDTO.getCusotmerId()); |
|
|
|
subCodeFormDTO.setParentCategoryCode(NumConstant.ZERO_STR); |
|
|
|
// subCodeFormDTO.setCategoryName("特殊群体照料");
|
|
|
|
List<OptionDTO> firstCategoryList=demandDictService.querySubCodeList(subCodeFormDTO); |
|
|
|
if(CollectionUtils.isEmpty(firstCategoryList)){ |
|
|
|
return new CategoryAnalysisResDTO(Collections.EMPTY_LIST,Collections.EMPTY_LIST); |
|
|
|
} |
|
|
|
//2、没有服务类型直接退出
|
|
|
|
Result<Map<String, String>> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); |
|
|
|
/*Result<Map<String, String>> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); |
|
|
|
if(!serviceTypeRes.success()||MapUtils.isEmpty(serviceTypeRes.getData())){ |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"查询服务方类型异常，请检查是否已经配置字典信息"); |
|
|
|
} |
|
|
|
List<LegendDTO> legend=new ArrayList<>(); |
|
|
|
serviceTypeRes.getData().forEach((code,name)->{ |
|
|
|
LegendDTO legendDTO=new LegendDTO(code,name); |
|
|
|
legend.add(legendDTO); |
|
|
|
}); |
|
|
|
LegendDTO unfinishLegend = new LegendDTO("unfinished", "未完成"); |
|
|
|
legend.add(unfinishLegend); |
|
|
|
|
|
|
|
log.info("阶段性胜利1："+ JSON.toJSONString(legend)); |
|
|
|
legend.add(unfinishLegend);*/ |
|
|
|
List<LegendDTO> legend=new ArrayList<>(); |
|
|
|
DemandAnalysisLegendEnum[] values = DemandAnalysisLegendEnum.values(); |
|
|
|
for (DemandAnalysisLegendEnum value : values) { |
|
|
|
LegendDTO legendDTO=new LegendDTO(); |
|
|
|
legendDTO.setLegendCode(value.getCode()); |
|
|
|
legendDTO.setLegendName(value.getName()); |
|
|
|
legend.add(legendDTO); |
|
|
|
} |
|
|
|
// log.info("阶段性胜利1："+ JSON.toJSONString(legend));
|
|
|
|
// 3、传进来的是组织id的话，查询出全路径
|
|
|
|
if("agency".equals(formDTO.getOrgType())){ |
|
|
|
//找到当前组织的所有上级，再拼接上自己
|
|
|
|
Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); |
|
|
|
/*Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); |
|
|
|
if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); |
|
|
|
} |
|
|
|
if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){ |
|
|
|
}*/ |
|
|
|
AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId()); |
|
|
|
if(NumConstant.ZERO_STR.equals(agencyInfoCache.getPid())||StringUtils.isBlank(agencyInfoCache.getPid())){ |
|
|
|
//当前传入的组织id=客户的根组织
|
|
|
|
formDTO.setGridPids(formDTO.getOrgId()); |
|
|
|
}else{ |
|
|
|
formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId())); |
|
|
|
formDTO.setGridPids(agencyInfoCache.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -1241,6 +1304,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
//2、志愿者姓名、手机号
|
|
|
|
Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet()); |
|
|
|
Map<String,UserBaseInfoResultDTO> userInfoMap=getVolunteerMap(userIdList); |
|
|
|
//3、居民信息志愿者
|
|
|
|
Set<String> icUserIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet()); |
|
|
|
Map<String,IcResiUserDTO> icUerInfoMap=getIcVolunteerMap(icUserIdList); |
|
|
|
|
|
|
|
for (ResiClientMyDemandResDTO resDto : list) { |
|
|
|
//3、查询分类名称
|
|
|
|
@ -1269,6 +1335,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName()); |
|
|
|
resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile()); |
|
|
|
break; |
|
|
|
case UserDemandConstant.IC_USER_VOLUNTEER: |
|
|
|
resDto.setServiceUnitName(StrConstant.EPMETY_STR); |
|
|
|
resDto.setServiceUserName(icUerInfoMap.get(resDto.getServerId()).getName()); |
|
|
|
resDto.setServiceUserMobile(icUerInfoMap.get(resDto.getServerId()).getMobile()); |
|
|
|
break; |
|
|
|
default: |
|
|
|
log.warn("serviceType 错误"); |
|
|
|
break; |
|
|
|
@ -1330,6 +1401,23 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
return userInfoMap; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取居民信息志愿者信息 |
|
|
|
* @param icUserIdList |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private Map<String, IcResiUserDTO> getIcVolunteerMap(Set<String> icUserIdList) { |
|
|
|
Map<String, IcResiUserDTO> icUserInfoMap = new HashMap<>(); |
|
|
|
if (CollectionUtils.isNotEmpty(icUserIdList)) { |
|
|
|
Result<List<IcResiUserDTO>> icUserInfoRes = epmetUserOpenFeignClient.getListIcResiUserDTO(new ArrayList<>(icUserIdList)); |
|
|
|
if (!icUserInfoRes.success() || CollectionUtils.isEmpty(icUserInfoRes.getData())) { |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); |
|
|
|
} |
|
|
|
icUserInfoMap = icUserInfoRes.getData().stream().collect(Collectors.toMap(IcResiUserDTO::getId, o -> o, (o1, o2) -> o1)); |
|
|
|
} |
|
|
|
return icUserInfoMap; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 我的需求-需求详情（待处理，处理中，已完成，已取消） |
|
|
|
* |
|
|
|
@ -1374,6 +1462,12 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName()); |
|
|
|
resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile()); |
|
|
|
break; |
|
|
|
case UserDemandConstant.IC_USER_VOLUNTEER: |
|
|
|
Map<String, IcResiUserDTO> icUserInfoMap = getIcVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); |
|
|
|
resDto.setServiceUnitName(StrConstant.EPMETY_STR); |
|
|
|
resDto.setServiceUserName(icUserInfoMap.get(resDto.getServerId()).getName()); |
|
|
|
resDto.setServiceUserMobile(icUserInfoMap.get(resDto.getServerId()).getMobile()); |
|
|
|
break; |
|
|
|
default: |
|
|
|
log.warn("serviceType 错误"); |
|
|
|
break; |
|
|
|
|
wangxianzhang
3 years ago