灵山项目：大屏居民搜索增加特殊人员类型和重点人员类型

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java

@@ -104,6 +104,7 @@ public interface UserConstant {
 	String GENDER="GENDER";
 	String HOUSE_TYPE_KEY="HOUSE_TYPE";
     String HOME_ID = "HOME_ID";
+    String IC_RESI_USER_ID = "icResiUserId";
 	/**
 	 * 居民信息 子表中的主表id
 	 */

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

@@ -3,10 +3,12 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.LingShanSpecialCrowdListResultDTO;
 import com.epmet.entity.IcSpecialEntity;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
@@ -27,4 +29,7 @@ public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
      * @return 返回重点帮扶人员类别
      */
     List<String> selectHelpCrowdType(String resiUserId);
-}
+
+    @MapKey("resiId")
+    List<Map<String, String>> findSpecialTypeByUserId(@Param("userIds") List<String> userIds);
+}

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

@@ -5,10 +5,12 @@ import com.epmet.dto.result.lingshan.LingShanHelpCrowdListRstDTO;
 import com.epmet.dto.result.lingshan.LingShanHelpCrowdScreenQtyOfSubOrgRstDTO;
 import com.epmet.dto.result.lingshan.LingShanHelpCrowdStatusByCateRstDTO;
 import com.epmet.entity.LingshanHelpCrowdResiMergeEntity;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 居民-重点帮扶人群对应关系
@@ -20,12 +22,12 @@ import java.util.List;
 public interface LingshanHelpCrowdResiMergeDao extends BaseDao<LingshanHelpCrowdResiMergeEntity> {
 
     /**
-     * @Description: 特殊人群：列表
      * @param orgIdPath:
      * @param helpType:
      * @param name:
      * @param mobile:
      * @param idCard:
+     * @Description: 特殊人群：列表
      * @Return java.util.List<com.epmet.dto.result.lingshan.LingShanHelpCrowdListRstDTO>
      * @Author: wangxianzhang
      * @Date: 2023/5/25 4:07 PM
@@ -37,8 +39,8 @@ public interface LingshanHelpCrowdResiMergeDao extends BaseDao<LingshanHelpCrowd
                                                     @Param("idCard") String idCard);
 
     /**
-     * @Description: 根据orgIdPath，统计本级及下级所有的分类及其数量
      * @param orgIdPath:
+     * @Description: 根据orgIdPath，统计本级及下级所有的分类及其数量
      * @Return java.util.List<com.epmet.dto.result.lingshan.LingShanHelpCrowdStatusByCateRstDTO>
      * @Author: wangxianzhang
      * @Date: 2023/5/29 2:15 PM
@@ -46,8 +48,8 @@ public interface LingshanHelpCrowdResiMergeDao extends BaseDao<LingshanHelpCrowd
     List<LingShanHelpCrowdStatusByCateRstDTO> statsByCategory(@Param("customerId") String customerId, @Param("orgIdPath") String orgIdPath);
 
     /**
-     * @Description: 子组织下的帮扶人群数量
      * @param orgIdPath:
+     * @Description: 子组织下的帮扶人群数量
      * @Return java.util.List<com.epmet.dto.result.lingshan.LingShanHelpCrowdScreenQtyOfSubOrgRstDTO>
      * @Author: wangxianzhang
      * @Date: 2023/5/29 3:14 PM
@@ -55,4 +57,7 @@ public interface LingshanHelpCrowdResiMergeDao extends BaseDao<LingshanHelpCrowd
     List<LingShanHelpCrowdScreenQtyOfSubOrgRstDTO> qtyOfSubOrg(@Param("orgIdPath") String orgIdPath,
                                                                @Param("helpType") String helpType,
                                                                @Param("customerId") String customerId);
-}
+
+    @MapKey("resiId")
+    List<Map<String, String>> findHlepTypeByResiUserId(@Param("userIds") List<String> userIds);
+}

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

@@ -60,4 +60,17 @@
           AND m.RESI_ID = #{resiUserId}
         order by m.CREATED_TIME asc
     </select>
-</mapper>
+    <select id="findSpecialTypeByUserId" resultType="java.util.Map">
+        select r.ID AS resiId
+             , s.SPECIAL_RQLB SPECIAL_TYPES_STR
+        from ic_resi_user r
+        inner join ic_special s on (r.ID = s.IC_RESI_USER and s.DEL_FLAG = 0)
+        where r.DEL_FLAG = 0
+        <if test="null != userIds and userIds.size > 0">
+            <foreach collection="userIds" item="userId" open="AND r.id IN (" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+        group by r.id
+    </select>
+</mapper>

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

@@ -78,5 +78,20 @@
         group by m.ORG_ID_PATH
     </select>
 
+    <select id="findHlepTypeByResiUserId" resultType="java.util.Map">
+        select
+            resi.id resiId,
+            group_concat(m.CROWD_TYPE) helpType
+        from lingshan_help_crowd_resi_merge m
+        inner join ic_resi_user resi on (resi.DEL_FLAG = 0 and m.RESI_ID = resi.ID)
+        where m.DEL_FLAG = 0
+        <if test="null != userIds and userIds.size > 0">
+            <foreach collection="userIds" item="userId" open="AND resi.id IN (" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+        group by resi.id
+    </select>
+
 
-</mapper>
+</mapper>