From c6665639b1c9bee40be06c1d75025ddeeb4e00da Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 15:10:58 +0800 Subject: [PATCH 01/12] =?UTF-8?q?/resi/mine/mygrid/latestgridinfo=3FappId?= =?UTF-8?q?=3DXX=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/redis/common/bean/GridInfoCache.java | 2 +- .../service/impl/ResiMineGridServiceImpl.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java index c55e61513e..17a55e8b17 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java @@ -115,7 +115,7 @@ public class GridInfoCache implements Serializable { private String coordinates; /** - * 弃用标记 + * 弃用标记 弃用：1；正常使用：0 */ private Integer abandonFlag; diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 78a32b482f..11f20c2f0c 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.grid.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -107,7 +108,7 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { **/ @Override public LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO) { - logger.info(String.format("居民端获取用户最近访问网格入参%s", JSON.toJSONString(formDTO))); + // logger.info(String.format("居民端获取用户最近访问网格入参%s", JSON.toJSONString(formDTO))); // 查询注册网格的弃用状态 LatestGridInfoResultDTO result = new LatestGridInfoResultDTO(); @@ -160,6 +161,19 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { } result.setGridId(StringUtils.isNotBlank(userResult.getData().getGridId()) ? userResult.getData().getGridId() : ""); result.setCustomerId(StringUtils.isNotBlank(userResult.getData().getCustomerId()) ? userResult.getData().getCustomerId() : ""); + //判断下最后一次访问的网格是否已经被删除或者被弃用 + if (StringUtils.isNotBlank(userResult.getData().getGridId())) { + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(result.getGridId()); + if (null == gridInfoCache || (null != gridInfoCache.getAbandonFlag() && NumConstant.ONE == gridInfoCache.getAbandonFlag())) { + result.setGridId(StrConstant.EPMETY_STR); + result.setCustomerId(StrConstant.EPMETY_STR); + logger.error(String.format("获取用户最近访问网格异常，网格可能被删除或者被弃用，参数%s",JSON.toJSONString(formDTO))); + return result; + } + result.setGridId(userResult.getData().getGridId()); + } else { + result.setGridId(StrConstant.EPMETY_STR); + } return result; } From 21566caf3bc052118fcdcd850b2f1e002c588f07 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Jun 2022 16:21:08 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E9=87=8A=E6=94=BE=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java index 2c391d6b81..48a3fd7828 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java @@ -53,6 +53,8 @@ public class NoRepeatSubmitAop { log.warn("noRepeatSubmit key:{},msg:{}", key, e.getMessage()); //"未获取到锁，重复提交了 throw new RenException(EpmetErrorCode.REPEAT_SUBMIT.getCode()); + } finally { + distributedLock.unLock(lock); } try { //因为getLock如果获取失败抛异常 所以不做锁状态的判断 From 3beb04c45f544979610af10444df58746b486595 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Jun 2022 17:00:16 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=87=8A=E6=94=BE=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/aop/NoRepeatSubmitAop.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java index 48a3fd7828..e1716469f2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java @@ -49,6 +49,8 @@ public class NoRepeatSubmitAop { long leaseTime = noRepeatSubmit.leaseTime(); //如果获取不到锁等待0秒直接返回 持锁时间为leaseTime lock = distributedLock.getLock(RedisKeys.getNoRepeatSubmitKey(key), leaseTime, NumConstant.ZERO_L, TimeUnit.MILLISECONDS); + //因为getLock如果获取失败抛异常 所以不做锁状态的判断 + result = pjp.proceed(); } catch (Exception e) { log.warn("noRepeatSubmit key:{},msg:{}", key, e.getMessage()); //"未获取到锁，重复提交了 @@ -56,13 +58,6 @@ public class NoRepeatSubmitAop { } finally { distributedLock.unLock(lock); } - try { - //因为getLock如果获取失败抛异常 所以不做锁状态的判断 - result = pjp.proceed(); - } finally { - distributedLock.unLock(lock); - } - return result; From 28ff0d820b5a2b7f3ff7e87fe49c03d5ae11e7e1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 11:09:22 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E7=BB=99=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=98=AF?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=8C=E7=9A=84=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/constant/UserDemandConstant.java | 4 +++- .../epmet/service/impl/IcUserDemandRecServiceImpl.java | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java index 2f449f9201..2f9fa07fac 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java @@ -47,11 +47,13 @@ public interface UserDemandConstant { String EVALUATE="evaluate"; // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； + + //volunteer是指的居民信息的志愿者 String VOLUNTEER="volunteer"; String SOCIAL_ORG="social_org"; String COMMUNITY_ORG="community_org"; String PARTY_UNIT="party_unit"; - + String EPMET_USER_VOLUNTEER="epmet_user_volunteer"; /** * 个人档案：personal-data 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 2d04bec434..e4a5eb348f 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 @@ -430,6 +430,13 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl 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> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(serverId)); if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) { throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询志愿者信息异常","志愿者信息查询异常"); @@ -1103,7 +1110,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Fri, 24 Jun 2022 13:28:45 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=88=AB=E4=B8=8A?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constant/UserDemandConstant.java | 2 +- .../impl/IcUserDemandRecServiceImpl.java | 98 +++++++++++++++---- .../epmet/feign/EpmetUserOpenFeignClient.java | 8 ++ .../EpmetUserOpenFeignClientFallback.java | 11 +++ .../controller/IcResiUserController.java | 14 +++ .../java/com/epmet/dao/IcResiUserDao.java | 2 + .../com/epmet/service/IcResiUserService.java | 2 + .../service/impl/IcResiUserServiceImpl.java | 13 +++ .../main/resources/mapper/IcResiUserDao.xml | 9 ++ 9 files changed, 141 insertions(+), 18 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java index 2f9fa07fac..b0a3d20fd7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java +++ b/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 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 e4a5eb348f..69013fe98a 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 @@ -275,18 +275,22 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl dictList=demandDictService.listByCodes(formDTO.getCustomerId(),categoryCodes); Map dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); - //3、查询志愿者 + //3、查询爱心互助志愿者 // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； Map userInfoMap=new HashMap<>(); Set userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); if(CollectionUtils.isNotEmpty(userIdList)){ Result> 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 icUserIdList = list.stream().filter(item -> null != item.getServiceType() && item.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); + Map icUserInfoMap =getIcVolunteerMap(icUserIdList); + //查询字典表 Result> reportTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); Map reportTypeMap=reportTypeRes.success()&& MapUtils.isNotEmpty(reportTypeRes.getData())?reportTypeRes.getData():new HashMap<>(); @@ -306,9 +310,19 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl> 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 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> 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 userIdList = Arrays.asList(res.getServerId()); Result> 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 userInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(res.getServerId()); + if (!userInfoRes.success() || null == userInfoRes.getData()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); + } + res.setServiceName(userInfoRes.getData().getName()); } //查询字典表 Result> reportTypeRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); @@ -845,7 +868,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl dictList=demandDictService.listByCodes(customerId,categoryCodes); Map dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); - //3、查询志愿者 + //3、查询爱心互助志愿者 // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； Map userInfoMap=new HashMap<>(); Set 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 icUserIdList = demandList.stream().filter(item -> null != item.getServiceType() && item.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); + Map 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 userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet()); Map userInfoMap=getVolunteerMap(userIdList); + //3、居民信息志愿者 + Set icUserIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.IC_USER_VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet()); + Map icUerInfoMap=getIcVolunteerMap(icUserIdList); for (ResiClientMyDemandResDTO resDto : list) { //3、查询分类名称 @@ -1276,6 +1312,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl getIcVolunteerMap(Set icUserIdList) { + Map icUserInfoMap = new HashMap<>(); + if (CollectionUtils.isNotEmpty(icUserIdList)) { + Result> 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 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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 90b0359881..7aa527475e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/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 getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId); + /** + * 获取ic_resi_user + * @param icResiUserIdList + * @return + */ + @PostMapping(value = "/epmetuser/icresiuser/list-icresiuser") + Result> getListIcResiUserDTO(@RequestBody List icResiUserIdList); + /** * @Description 查询居民注册关系 * @param userId diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 55083de3a2..cf8c53d1b2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/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> getListIcResiUserDTO(List icResiUserIdList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getListIcResiUserDTO", icResiUserIdList); + } + @Override public Result resiRelationInfo(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "resiRelationInfo", userId); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 8e9e6a41c7..ce9e970a4e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/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> getListIcResiUserDTO(@RequestBody List icResiUserIdList) { + if (CollectionUtils.isEmpty(icResiUserIdList)) { + return new Result<>(); + } + return new Result>().ok(icResiUserService.getListIcResiUserDTO(icResiUserIdList)); + } + /** * 【社区查询】搜索居民们 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index f145fadd97..0f5d165f1a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -370,4 +370,6 @@ public interface IcResiUserDao extends BaseDao { * @return com.epmet.entity.IcResiUserEntity */ IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + + List getListIcResiUserDTO(@Param("icResiUserIdList") List icResiUserIdList); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 3ef76601bc..e6bc952d3e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -436,4 +436,6 @@ public interface IcResiUserService extends BaseService { * @Date 2022/6/16 15:30 */ List getUserId(String icResiUserId); + + List getListIcResiUserDTO(List icResiUserIdList); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index a7d1183196..7f1374c89a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2536,6 +2536,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getListIcResiUserDTO(List icResiUserIdList) { + if(CollectionUtils.isEmpty(icResiUserIdList)){ + return new ArrayList<>(); + } + return baseDao.getListIcResiUserDTO(icResiUserIdList); + } + /** * 根据身份证获取居民角色（目前只有是否是志愿者） * diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index edb2455bee..97ed0a988a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1132,4 +1132,13 @@ AND customer_id = #{customerId} AND DEL_FLAG = '0' + + From 80fd38fa0d4d02ac9a0c2154342fcfa0d680fca0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 14:44:29 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=88=AB=E4=B8=8A?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E3=80=822?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserDemandRecServiceImpl.java | 27 +++++++++++++++---- .../resources/mapper/IcUserDemandRecDao.xml | 2 +- 2 files changed, 23 insertions(+), 6 deletions(-) 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 69013fe98a..b95e38725c 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 @@ -31,7 +31,9 @@ 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; @@ -961,15 +963,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); + /*Result 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())); } } @@ -1010,11 +1013,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl iter = detailMap.keySet().iterator(); + String key = ""; + while (iter.hasNext()) { + key = iter.next(); + if(key.contains(resultDetail.getLegendCode())){ + resultDetail.setTotalService(detailMap.get(resultDetail.getLegendCode()).getTotalService()); + resultDetail.setServiceDemandTotal(detailMap.get(resultDetail.getLegendCode()).getServiceDemandTotal()); + } + } + + } + } + /*for(CategoryAnalysisDetail resultDetail:result.getDetail()){ if(detailMap.containsKey(resultDetail.getLegendCode())&&null!=detailMap.get(resultDetail.getLegendCode())){ resultDetail.setTotalService(detailMap.get(resultDetail.getLegendCode()).getTotalService()); resultDetail.setServiceDemandTotal(detailMap.get(resultDetail.getLegendCode()).getServiceDemandTotal()); } - } + }*/ } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 158dcb1b7d..0a0bdd34ae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -120,7 +120,7 @@ and r.STATUS=#{status} - and s.SERVICE_TYPE=#{serviceType} + and s.SERVICE_TYPE like concat('%',#{serviceType},'%') and s.SERVER_ID=#{serverId} From 44e57b9f8ed5d94a849d07f29cc2a08887616c21 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 15:12:26 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=88=AB=E4=B8=8A?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E3=80=823?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcUserDemandRecController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 3405c0c019..25db823b01 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -98,6 +98,7 @@ public class IcUserDemandRecController implements ResultDataResolver { formDTO.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class); if (UserDemandConstant.VOLUNTEER.equals(formDTO.getServiceType())) { + //应该查询爱心互助的志愿者 return new Result>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(), formDTO.getStaffId(),formDTO.getServiceName())); } else if (UserDemandConstant.SOCIAL_ORG.equals(formDTO.getServiceType())) { ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class, ServiceQueryFormDTO.SocietyOrgInternalGroup.class); @@ -106,6 +107,8 @@ public class IcUserDemandRecController implements ResultDataResolver { return new Result>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO)); } else if (UserDemandConstant.PARTY_UNIT.equals(formDTO.getServiceType())) { return new Result>().ok(icPartyUnitService.queryServiceList(formDTO)); + }else if (UserDemandConstant.IC_USER_VOLUNTEER.equals(formDTO.getServiceType())) { + return new Result>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(), formDTO.getStaffId(),formDTO.getServiceName())); } return new Result<>(); } From b5b1eebd5ecc98e651867c1f358d01c0f3d5c23e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 15:48:36 +0800 Subject: [PATCH 08/12] =null --- .../java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b95e38725c..71957855e7 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 @@ -456,7 +456,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl icUserInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(serverId); - if (!icUserInfoRes.success() || null!=icUserInfoRes.getData()) { + if (!icUserInfoRes.success() || null==icUserInfoRes.getData()) { throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常"); } serviceName=icUserInfoRes.getData().getName(); From 0505c83b1d1a23ac7ad460ff3b89342fd06e70a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 16:06:12 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD=E5=88=86=E6=9E=90-?= =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserDemandRecServiceImpl.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) 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 71957855e7..62d90ee33e 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 @@ -25,6 +25,7 @@ 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; @@ -262,6 +263,10 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl pageInfo= PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageSelect(formDTO)); List list=pageInfo.getList(); @@ -947,19 +952,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); + /*Result> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); if(!serviceTypeRes.success()||MapUtils.isEmpty(serviceTypeRes.getData())){ throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"查询服务方类型异常，请检查是否已经配置字典信息"); } - List 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 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())){ //找到当前组织的所有上级，再拼接上自己 From 21064837a334a43cf0fb318c03e449532ef9489c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 16:11:34 +0800 Subject: [PATCH 10/12] DemandAnalysisLegendEnum --- .../tools/enums/DemandAnalysisLegendEnum.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java new file mode 100644 index 0000000000..dc4d024308 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java @@ -0,0 +1,43 @@ +package com.epmet.commons.tools.enums; + +public enum DemandAnalysisLegendEnum { + + /** + * 环境变量枚举 + */ + VOLUNTEER("volunteer", "志愿者"), + PARTY_UNIT("party_unit", "联建单位"), + COMMUNITY_ORG("community_org", "社区自组织"), + UNFINISHED("unfinished", "未完成"), + ; + + private String code; + private String name; + + + + DemandAnalysisLegendEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static DemandAnalysisLegendEnum getEnum(String code) { + DemandAnalysisLegendEnum[] values = DemandAnalysisLegendEnum.values(); + for (DemandAnalysisLegendEnum value : values) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + + public String getCode() { + return code; + } + + public String getName() { + return name; + } + +} From 06374f9283b0b346d343a2b108fe9cbe74334716 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jun 2022 16:48:05 +0800 Subject: [PATCH 11/12] serviceShowName --- .../service/impl/IcUserDemandRecServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 62d90ee33e..ffb3b10869 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 @@ -335,7 +335,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Fri, 24 Jun 2022 17:48:56 +0800 Subject: [PATCH 12/12] /userdemand/category-analysis --- .../tools/enums/DemandAnalysisLegendEnum.java | 2 +- .../impl/IcUserDemandRecServiceImpl.java | 17 ++--------- .../resources/mapper/IcUserDemandRecDao.xml | 28 +++++++++++++++++++ 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java index dc4d024308..0b7a0bc5f4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DemandAnalysisLegendEnum.java @@ -5,7 +5,7 @@ public enum DemandAnalysisLegendEnum { /** * 环境变量枚举 */ - VOLUNTEER("volunteer", "志愿者"), + VOLUNTEER("ic_user_volunteer", "志愿者"), PARTY_UNIT("party_unit", "联建单位"), COMMUNITY_ORG("community_org", "社区自组织"), UNFINISHED("unfinished", "未完成"), 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 ffb3b10869..d27c32445e 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 @@ -955,6 +955,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl firstCategoryList=demandDictService.querySubCodeList(subCodeFormDTO); if(CollectionUtils.isEmpty(firstCategoryList)){ return new CategoryAnalysisResDTO(Collections.EMPTY_LIST,Collections.EMPTY_LIST); @@ -1032,25 +1033,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl iter = detailMap.keySet().iterator(); - String key = ""; - while (iter.hasNext()) { - key = iter.next(); - if(key.contains(resultDetail.getLegendCode())){ - resultDetail.setTotalService(detailMap.get(resultDetail.getLegendCode()).getTotalService()); - resultDetail.setServiceDemandTotal(detailMap.get(resultDetail.getLegendCode()).getServiceDemandTotal()); - } - } - - } - } - /*for(CategoryAnalysisDetail resultDetail:result.getDetail()){ if(detailMap.containsKey(resultDetail.getLegendCode())&&null!=detailMap.get(resultDetail.getLegendCode())){ resultDetail.setTotalService(detailMap.get(resultDetail.getLegendCode()).getTotalService()); resultDetail.setServiceDemandTotal(detailMap.get(resultDetail.getLegendCode()).getServiceDemandTotal()); } - }*/ + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 0a0bdd34ae..4fe2195446 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -389,6 +389,7 @@ when s.SERVICE_TYPE='social_org' then '社会组织' when s.SERVICE_TYPE='community_org' then '社区自组织' when s.SERVICE_TYPE='party_unit' then '区域化党建单位' + when s.SERVICE_TYPE='ic_user_volunteer' then '志愿者' end )as legendName, count(s.DEMAND_REC_ID) as serviceDemandTotal, @@ -406,6 +407,7 @@ and m.GRID_PIDS like concat(#{gridPids},'%') + and s.SERVICE_TYPE not like '%volunteer%' and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{categoryCode},'%') @@ -413,6 +415,32 @@ union all + select + #{categoryCode} as categoryCode, + 'ic_user_volunteer' as legendCode, + '志愿者' as legendName, + count(s.DEMAND_REC_ID) as serviceDemandTotal, + count(distinct s.SERVER_ID) as totalService + from ic_user_demand_service s + inner join ic_user_demand_rec m + on(s.DEMAND_REC_ID=m.ID) + where s.DEL_FLAG='0' + and m.DEL_FLAG='0' + and m.`STATUS`='finished' + and m.CUSTOMER_ID=#{customerId} + + and m.GRID_ID=#{orgId} + + + and m.GRID_PIDS like concat(#{gridPids},'%') + + and s.SERVICE_TYPE like '%volunteer%' + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} + and m.CATEGORY_CODE like concat(#{categoryCode},'%') + + union all + select #{categoryCode} as categoryCode, 'unfinished' as legendCode,