Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

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

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

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -580,8 +580,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 "【事件研判分析】查询分类字典失败");
 
         // 上报人信息
+        IcEventYpAnalysisResultDTO r = new IcEventYpAnalysisResultDTO();
         String idCard = event.getIdCard();
-        String icResiId = null;
         List<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
         if (StringUtils.isNotBlank(idCard)) {
             IcResiUserDTO resiInfo = getResultDataOrThrowsException(userOpenFeignClient.getByResiIdCard(idCard),
@@ -590,14 +590,14 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                     "【事件研判分析】根据身份证号查找居民信息失败",
                     "【事件研判分析】根据身份证号查找居民信息失败");
             if (resiInfo != null) {
-                icResiId = resiInfo.getId();
+                r.setReportorResiId(resiInfo.getId());
+                r.setReportorAgencyId(resiInfo.getAgencyId());
+                r.setReportorGridId(resiInfo.getGridId());
             }
 
             dependents = getDependents(event.getIdCard());
         }
 
-        IcEventYpAnalysisResultDTO r = new IcEventYpAnalysisResultDTO();
-        r.setReportorResiId(icResiId);
         r.setReportorName(event.getName());
         r.setSourceTypeName(sourceTypeMap.get(event.getSourceType()));
         r.setDependents(dependents);
@@ -624,12 +624,14 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 "【事件研判分析】查找家属失败",
                 "【事件研判分析】查找家属失败");
 
+        List<HouseUserDTO> houseUserList = familyInfo.getHouseUserList();
+
         ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
-        if (CollectionUtils.isEmpty(dependents)) {
+        if (CollectionUtils.isEmpty(houseUserList)) {
             return dependents;
         }
-        for (HouseUserDTO u : familyInfo.getHouseUserList()) {
+        for (HouseUserDTO u : houseUserList) {
-            dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName()));
+            dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName(), u.getAgencyId(), u.getGridId()));
         }
         return dependents;
     }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -60,7 +60,7 @@
               and e.STATUS = #{processStatus}
           </if>
           <if test="categoryCode != null and categoryCode != ''">
-              and c.CATEGORY_CODE = #{categoryCode}
+              and c.CATEGORY_CODE like CONCAT(#{categoryCode},'%')
           </if>
         </where>
         order by e.CREATED_TIME desc

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

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, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
 public interface EpmetUserOpenFeignClient {
 
     /**

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 @@
     <select id="selectListFamilyMember" parameterType="map" resultType="com.epmet.dto.result.HouseUserDTO">
         SELECT
             m.ID AS icResiUserId,
-            m.`NAME` AS icUserName
+            m.`NAME` AS icUserName,
+            m.AGENCY_ID AS agencyId,
+            m.GRID_ID AS gridId
         FROM
             ic_resi_user m
         WHERE