From 58a8741cace0b8ac65b1d50500321af0b68c0a58 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 20 May 2022 10:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=88=86=E6=9E=90=E3=80=91=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B1=85=E6=B0=91agencyId=E5=92=8Cg?= =?UTF-8?q?ridId=E7=9A=84=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=BE=9B=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E6=A1=A3=E6=A1=88=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/HouseUserDTO.java | 2 ++ .../dto/result/IcEventYpAnalysisResultDTO.java | 7 ++++++- .../epmet/service/impl/IcEventServiceImpl.java | 16 +++++++++------- .../src/main/resources/mapper/IcEventDao.xml | 2 +- .../java/com/epmet/dto/result/HouseUserDTO.java | 2 ++ .../epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- .../src/main/resources/mapper/IcResiUserDao.xml | 8 ++++++-- 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java index 4ade8603df..15359f851d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java @@ -8,4 +8,6 @@ import java.io.Serializable; public class HouseUserDTO implements Serializable { private String icResiUserId; private String icUserName; + private String agencyId; + private String gridId; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java index dd1796ebde..1bf3e0ce99 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java @@ -38,6 +38,10 @@ public class IcEventYpAnalysisResultDTO { * 上报人身份证号 */ private String reportorIdCard; + + private String reportorAgencyId; + + private String reportorGridId; /** * 上报渠道名称 */ @@ -56,7 +60,6 @@ public class IcEventYpAnalysisResultDTO { */ private String categoryPids; - /** * 家属 */ @@ -66,6 +69,8 @@ public class IcEventYpAnalysisResultDTO { public static class Dependent { private String id; private String name; + private String agencyId; + private String gridId; } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 95de4e4bba..69cd5e400b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -572,8 +572,8 @@ public class IcEventServiceImpl extends BaseServiceImpl dependents = new ArrayList<>(); if (StringUtils.isNotBlank(idCard)) { IcResiUserDTO resiInfo = getResultDataOrThrowsException(userOpenFeignClient.getByResiIdCard(idCard), @@ -582,14 +582,14 @@ public class IcEventServiceImpl extends BaseServiceImpl houseUserList = familyInfo.getHouseUserList(); + ArrayList dependents = new ArrayList<>(); - if (CollectionUtils.isEmpty(dependents)) { + if (CollectionUtils.isEmpty(houseUserList)) { return dependents; } - for (HouseUserDTO u : familyInfo.getHouseUserList()) { - dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName())); + for (HouseUserDTO u : houseUserList) { + dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName(), u.getAgencyId(), u.getGridId())); } return dependents; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index b9ba5d91a1..b76d3c9259 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -60,7 +60,7 @@ and e.STATUS = #{processStatus} - and c.CATEGORY_CODE = #{categoryCode} + and c.CATEGORY_CODE like CONCAT(#{categoryCode},'%') order by e.CREATED_TIME desc diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java index ad44b7a13a..c98753f30f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java @@ -15,4 +15,6 @@ public class HouseUserDTO implements Serializable { */ private String icResiUserId; private String icUserName; + private String agencyId; + private String gridId; } 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 17f94a25c0..3fbbbe7bc8 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 @@ -23,8 +23,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** 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 8bf937a7e5..7678d14730 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 @@ -398,7 +398,9 @@ id, `name`, id_card, - mobile + mobile, + agency_id, + grid_id FROM ic_resi_user WHERE @@ -483,7 +485,9 @@