暂存别上生产。

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java

@@ -53,7 +53,7 @@ public interface UserDemandConstant {
     String SOCIAL_ORG="social_org";
     String COMMUNITY_ORG="community_org";
     String PARTY_UNIT="party_unit";
-    String EPMET_USER_VOLUNTEER="epmet_user_volunteer";
+    String IC_USER_VOLUNTEER="ic_user_volunteer";
 
     /**
      * 个人档案：personal-data

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

@@ -275,18 +275,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,9 +310,19 @@ 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
@@ -430,19 +444,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(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
+                }
+                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;
-            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(), "查询志愿者信息异常","志愿者信息查询异常");
-                }
-                serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
-                break;
             default:
                 log.warn("serviceType 错误");
                 break;
@@ -640,9 +656,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());
@@ -845,7 +868,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());
@@ -857,6 +880,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());
@@ -866,9 +893,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；
@@ -884,6 +908,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:
@@ -1110,7 +1143,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         operateLogDao.insert(logEntity);
         //3、插入或更新服务记录
         IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
-        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.EPMET_USER_VOLUNTEER);
+        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
         if (StringUtils.isBlank(serviceName)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
         }
@@ -1248,6 +1281,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、查询分类名称
@@ -1276,6 +1312,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;
@@ -1337,6 +1378,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;
+    }
+
     /**
      * 我的需求-需求详情（待处理，处理中，已完成，已取消）
      *
@@ -1381,6 +1439,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;

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -697,6 +697,14 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}")
     Result<IcResiUserDTO> getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId);
 
+    /**
+     * 获取ic_resi_user
+     * @param icResiUserIdList
+     * @return
+     */
+    @PostMapping(value = "/epmetuser/icresiuser/list-icresiuser")
+    Result<List<IcResiUserDTO>> getListIcResiUserDTO(@RequestBody List<String> icResiUserIdList);
+
     /**
      * @Description  查询居民注册关系
      * @param userId

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -515,6 +515,17 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserDTO", icResiUserId);
     }
 
+    /**
+     * 获取ic_resi_user
+     *
+     * @param icResiUserIdList
+     * @return
+     */
+    @Override
+    public Result<List<IcResiUserDTO>> getListIcResiUserDTO(List<String> icResiUserIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getListIcResiUserDTO", icResiUserIdList);
+    }
+
     @Override
     public Result<RegisterRelationDTO> resiRelationInfo(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "resiRelationInfo", userId);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -955,6 +955,20 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result<>();
     }
 
+    /**
+     * 获取ic_resi_user
+     * 目前只返回id, name
+     * @param icResiUserIdList
+     * @return
+     */
+    @PostMapping(value = "list-icresiuser")
+    public Result<List<IcResiUserDTO>> getListIcResiUserDTO(@RequestBody List<String> icResiUserIdList) {
+        if (CollectionUtils.isEmpty(icResiUserIdList)) {
+            return new Result<>();
+        }
+        return new Result<List<IcResiUserDTO>>().ok(icResiUserService.getListIcResiUserDTO(icResiUserIdList));
+    }
+
     /**
      * 【社区查询】搜索居民们
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -370,4 +370,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     * @return com.epmet.entity.IcResiUserEntity
     */
     IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId")  String customerId);
+
+    List<IcResiUserDTO> getListIcResiUserDTO(@Param("icResiUserIdList") List<String> icResiUserIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -436,4 +436,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/6/16 15:30
      */
     List<String> getUserId(String icResiUserId);
+
+    List<IcResiUserDTO> getListIcResiUserDTO(List<String> icResiUserIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2536,6 +2536,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return baseInfoList.stream().map(UserBaseInfoEntity::getUserId).collect(Collectors.toList());
     }
 
+    /**
+     * 目前只返回id,和姓名
+     * @param icResiUserIdList
+     * @return
+     */
+    @Override
+    public List<IcResiUserDTO> getListIcResiUserDTO(List<String> icResiUserIdList) {
+        if(CollectionUtils.isEmpty(icResiUserIdList)){
+            return new ArrayList<>();
+        }
+        return baseDao.getListIcResiUserDTO(icResiUserIdList);
+    }
+
     /**
      * 根据身份证获取居民角色（目前只有是否是志愿者）
      *

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -1132,4 +1132,13 @@
             AND customer_id = #{customerId}
             AND DEL_FLAG = '0'
     </select>
+
+    <select id="getListIcResiUserDTO" parameterType="map" resultType="com.epmet.dto.IcResiUserDTO">
+        select id, NAME,MOBILE
+        from ic_resi_user
+        WHERE  DEL_FLAG = '0'
+        <foreach collection="icResiUserIdList" item="icResiUserId" open="AND (" separator="or" close=")">
+           id = #{icResiUserId}
+        </foreach>
+    </select>
 </mapper>