Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java

@@ -139,8 +139,8 @@ public class LingshanHelpCrowdSaveFormDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        @DateTimeFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
+        @DateTimeFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**
@@ -381,8 +381,8 @@ public class LingshanHelpCrowdSaveFormDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        @DateTimeFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
+        @DateTimeFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java

@@ -143,7 +143,7 @@ public class LingshanHelpCrowdDetailRstDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**
@@ -384,7 +384,7 @@ public class LingshanHelpCrowdDetailRstDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**

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/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java

@@ -9,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -24,18 +25,21 @@ public class LingshanHelpCrowdCanjiExcelData extends LingShanHelpCrowdBaseExcelD
      * 残疾证号
      */
 	@ExcelProperty(value = "*残疾证号")
+    @NotBlank(message = "残疾证号必填")
     private String cjzh;
 
     /**
      * 残疾类别，字典
      */
 	@ExcelProperty(value = "*残疾类型", converter = LingShanHelpCrowdExcelConverter.class)
+    @NotBlank(message = "残疾类型必填")
     private String cjlb;
 
     /**
      * 残疾登记（状况）  字典
      */
 	@ExcelProperty(value = "*残疾等级", converter = LingShanHelpCrowdExcelConverter.class)
+    @NotBlank(message = "残疾等级必填")
     private String cjzk;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java

@@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -21,12 +23,14 @@ public class LingshanHelpCrowdDabingExcelData extends LingShanHelpCrowdBaseExcel
      * 所患病种（大病）
      */
 	@ExcelProperty(value = "*患病病种")
+	@NotBlank(message = "患病病种必填")
 	private String shbz;
 
     /**
      * 患病时间
      */
 	@ExcelProperty(value = "*患病时间")
+	@NotNull(message = "患病时间必填")
 	private Date hbsj;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java

@@ -1,6 +1,7 @@
 package com.epmet.excel.data;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
@@ -8,6 +9,8 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -30,12 +33,14 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD
      * 低保类型。200农村低保，201城镇低保
      */
 	@ExcelProperty(value = "*低保类型", converter = LingShanHelpCrowdExcelConverter.class)
+	@NotNull(message = "低保类型必填")
 	private Integer dblx;
 
     /**
      * 低保（特困）证号
      */
 	@ExcelProperty(value = "*低保（特困）证号")
+	@NotBlank(message = "低保（特困）证号必填")
 	private String dbzh;
 
     /**
@@ -90,6 +95,7 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD
      * 最初享受月份
      */
 	@ExcelProperty(value = "最初享受月份")
+	@DateTimeFormat("yyyy-MM")
 	private Date zcxsyf;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 重点帮扶-独居老人
  *
@@ -17,12 +19,14 @@ public class LingshanHelpCrowdDujuExcelData extends LingShanHelpCrowdBaseExcelDa
      * 监护人姓名
      */
 	@ExcelProperty(value = "*监护人姓名")
+	@NotBlank(message = "监护人姓名必填")
 	private String jhrxm;
 
     /**
      * 监护人电话
      */
 	@ExcelProperty(value = "*监护人电话")
+	@NotBlank(message = "监护人电话必填")
 	private String jhrdh;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java

@@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -28,6 +30,7 @@ public class LingshanHelpCrowdGaolingExcelData extends LingShanHelpCrowdBaseExce
      * 津贴金额（元）
      */
     @ExcelProperty(value = "*津贴金额（元）")
+    @NotNull(message = "津贴金额（元）必填")
     private BigDecimal jtje;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java

@@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 重点帮扶-独居老人
  *
@@ -20,12 +22,14 @@ public class LingshanHelpCrowdKongchaoExcelData extends LingShanHelpCrowdBaseExc
      * 监护人姓名
      */
 	@ExcelProperty(value = "*监护人姓名")
+	@NotBlank(message = "监护人姓名必填")
 	private String jhrxm;
 
     /**
      * 监护人电话
      */
 	@ExcelProperty(value = "*监护人电话")
+	@NotBlank(message = "监护人电话必填")
 	private String jhrdh;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java

@@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 重点帮扶-留守儿童
  *
@@ -19,24 +21,28 @@ public class LingshanHelpCrowdLiushouExcelData extends LingShanHelpCrowdBaseExce
      * 监护人姓名
      */
 	@ExcelProperty(value = "*监护人姓名")
+	@NotBlank(message = "监护人姓名必填")
 	private String jhrxm;
 
     /**
      * 监护人电话
      */
 	@ExcelProperty(value = "*监护人电话")
+	@NotBlank(message = "监护人电话必填")
 	private String jhrdh;
 
     /**
      * 与监护人关系
      */
 	@ExcelProperty(value = "*与监护人关系")
+	@NotBlank(message = "与监护人关系必填")
 	private String yjhrgx;
 
     /**
      * 所在学校及班级
      */
 	@ExcelProperty(value = "*所在学校及班级")
+	@NotBlank(message = "所在学校及班级必填")
 	private String szxxjbj;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java

@@ -1,6 +1,7 @@
 package com.epmet.excel.data;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
@@ -8,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -30,6 +32,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD
      * 低保（特困）证号
      */
 	@ExcelProperty(value = "*低保（特困）证号")
+	@NotBlank(message = "低保（特困）证号必填")
 	private String dbzh;
 
     /**
@@ -84,6 +87,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD
      * 最初享受月份
      */
 	@ExcelProperty(value = "最初享受月份")
+	@DateTimeFormat("yyyy-MM")
 	private Date zcxsyf;
 
     /**

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

@@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.bean.ResiExportBaseInfoData;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
-import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
@@ -170,16 +169,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private UserBaseInfoDao userBaseInfoDao;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-    @Autowired
-    private DistributedLock distributedLock;
+
     @Resource
     private IcUserChangeRecordDao icUserChangeRecordDao;
     @Resource
     private IcUserChangeDetailedDao icUserChangeDetailedDao;
-
     // @Autowired
     // private DataReportOpenFeignClient dataReportOpenFeignClient;
-
     @Autowired
     private IcResiRentContractInfoDao icResiRentContractInfoDao;
 
@@ -191,6 +187,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Autowired
     private IcSpecialDao icSpecialDao;
 
+    @Autowired
+    private LingshanHelpCrowdResiMergeDao helpCrowdResiMergeDao;
+
     /**
      * 组织字段，目前用于居民信息动态查询接口。将此条件从conditions中移除，单独生成固定的sql片段
      */
@@ -233,6 +232,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     /**
      * 该接口供开发人员，手动调用
      * 项目上经常要求删除某个社区的人房数据， 索性写一个接口。供开发人员调用
+     *
      * @param formDTO
      * @return
      */
@@ -465,6 +465,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     /**
      * 为党员信息生成家庭地址
+     *
      * @param customerId
      * @param gridId
      * @param homeId
@@ -801,10 +802,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @description: 生成居民变更记录
      * @param entity
      * @param map
      * @return
+     * @description: 生成居民变更记录
      * @author: sun
      */
     public void icUserChangeRecord(IcResiUserEntity entity, LinkedHashMap<String, String> map) {
@@ -1044,6 +1045,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //查询网格名称、房屋名称用
         List<String> gridIds = new ArrayList<>();
         Set<String> houseIds = new HashSet<>();
+        List<String> userIds = new ArrayList<>();
         for (Map<String, Object> map : list) {
             if (map.containsKey(UserConstant.GRID_ID) && null != map.get(UserConstant.GRID_ID) && StringUtils.isNotBlank(map.get(UserConstant.GRID_ID).toString())) {
                 gridIds.add(map.get(UserConstant.GRID_ID).toString());
@@ -1051,6 +1053,33 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             if (map.containsKey(UserConstant.HOME_ID) && null != map.get(UserConstant.HOME_ID) && StringUtils.isNotBlank(map.get(UserConstant.HOME_ID).toString())) {
                 houseIds.add(map.get(UserConstant.HOME_ID).toString());
             }
+            //过滤居民ID
+            if (map.containsKey(UserConstant.IC_RESI_USER_ID) && null != map.get(UserConstant.IC_RESI_USER_ID) && StringUtils.isNotBlank(map.get(UserConstant.IC_RESI_USER_ID).toString())) {
+                userIds.add(map.get(UserConstant.IC_RESI_USER_ID).toString());
+            }
+        }
+        Map<String, String> helpTypeMap = new HashMap<>();
+        List<Map<String, String>> helpTypeList = helpCrowdResiMergeDao.findHlepTypeByResiUserId(userIds);
+        if (null != helpTypeList && helpTypeList.size() > 0) {
+            for (Map<String, String> map : helpTypeList) {
+                buildHelpType(map, helpTypeMap);
+            }
+        }
+        Map<String, String> specialTypeMap = new HashMap<>();
+        List<Map<String, String>> specialTypeList = icSpecialDao.findSpecialTypeByUserId(userIds);
+        if (null != specialTypeList && specialTypeList.size() > 0) {
+            for (Map<String, String> map : specialTypeList) {
+                buildSpecialType(map, specialTypeMap);
+            }
+        }
+        for (Map<String, Object> map : list) {
+            for (String key : map.keySet()) {
+                if (key.equals(UserConstant.IC_RESI_USER_ID)) {
+                    map.put("helpTypeDisplay", helpTypeMap.get(map.get(key)) == null ? "/" : helpTypeMap.get(map.get(key)));
+                    map.put("specialTypeDisplay", specialTypeMap.get(map.get(key)) == null ? "/" : specialTypeMap.get(map.get(key)));
+                    break;
+                }
+            }
         }
         Map<String, AllGridsByUserIdResultDTO> gridInfoMap = getGridInfoMap(gridIds);
         //查询房子名称
@@ -1063,6 +1092,81 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
 
+    private void buildHelpType(Map<String, String> helpTypeMap, Map<String, String> map) {
+        if (helpTypeMap.size() > 0) {
+            String temp = "";
+            for (String k : helpTypeMap.keySet()) {
+                if (k.equals("helpType")) {
+                    StringBuilder sb = new StringBuilder();
+                    String[] keys = helpTypeMap.get(k).split(",");
+                    for (String key : keys) {
+                        if (key.equals(LingShanHelpCrowdTypeEnum.CANJI.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.CANJI.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.DABING.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.DABING.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.DIBAO.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.DIBAO.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.GAOLING.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.GAOLING.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.KONGCHAO.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.KONGCHAO.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.DUJU.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.DUJU.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.LIUSHOU.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.LIUSHOU.getName()).append(",");
+                        }
+                        if (key.equals(LingShanHelpCrowdTypeEnum.TEKUN.getType())) {
+                            sb.append(LingShanHelpCrowdTypeEnum.TEKUN.getName()).append(",");
+                        }
+                    }
+                    temp = sb.substring(0, sb.lastIndexOf(","));
+                } else if (k.equals("resiId")) {
+                    map.put(helpTypeMap.get(k), temp);
+                    temp = "";
+                }
+            }
+        }
+    }
+
+    private void buildSpecialType(Map<String, String> specialMap, Map<String, String> map) {
+        if (specialMap.size() > 0) {
+            String temp = "";
+            for (String k : specialMap.keySet()) {
+                if (k.equals("SPECIAL_TYPES_STR")) {
+                    StringBuilder sb = new StringBuilder();
+                    String[] keys = specialMap.get(k).split(",");
+                    for (String key : keys) {
+                        if (key.equals(LingShanSpecialCrowdTypeEnums.AZBJ.getType())) {
+                            sb.append(LingShanSpecialCrowdTypeEnums.AZBJ.getName()).append(",");
+                        }
+                        if (key.equals(LingShanSpecialCrowdTypeEnums.SQJZ.getType())) {
+                            sb.append(LingShanSpecialCrowdTypeEnums.SQJZ.getName()).append(",");
+                        }
+                        if (key.equals(LingShanSpecialCrowdTypeEnums.JDRY.getType())) {
+                            sb.append(LingShanSpecialCrowdTypeEnums.JDRY.getName()).append(",");
+                        }
+                        if (key.equals(LingShanSpecialCrowdTypeEnums.JZHZ.getType())) {
+                            sb.append(LingShanSpecialCrowdTypeEnums.JZHZ.getName()).append(",");
+                        }
+                        if (key.equals(LingShanSpecialCrowdTypeEnums.XFRY.getType())) {
+                            sb.append(LingShanSpecialCrowdTypeEnums.XFRY.getName()).append(",");
+                        }
+                    }
+                    temp = sb.substring(0, sb.lastIndexOf(","));
+                } else if (k.equals("resiId")) {
+                    map.put(specialMap.get(k), temp);
+                    temp = "";
+                }
+            }
+        }
+    }
+
     private List<IcFormResColumnDTO> queryResultColumns(IcResiUserPageFormDTO formDTO) {
         // 查询列表展示项，如果没有，直接返回
         CustomerFormQueryDTO queryDTO1 = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class);
@@ -3096,6 +3200,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     /**
      * 获取组织下志愿者列表
      * 居民信息里的志愿者
+     *
      * @param customerId
      * @param agencyId
      * @Param customerId
@@ -3220,6 +3325,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     /**
      * 目前只返回id,和姓名
+     *
      * @param icResiUserIdList
      * @return
      */
@@ -3453,6 +3559,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     /**
      * desc:设置居民的pids pids为agencyId的pids+agencyId 即包含组织本身 如果pids 为空则pids 为agencyId
+     *
      * @param entity
      */
     @Override
@@ -3678,6 +3785,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     /**
      * Desc: 居民首次进入小程序，可以根据输入身份证信息查询在数字社区居民信息中的网格，匹配不成功提示
+     *
      * @param formDTO
      * @author zxc
      * @date 2022/8/5 11:17
@@ -3804,7 +3912,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
 
-
     /**
      * 更新育龄妇女状态定时任务
      *
@@ -3959,8 +4066,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @Description 人户状况统计查询
      * @param formDTO
+     * @Description 人户状况统计查询
      * @Author zxc
      * @Date 2022/11/16 09:22
      */
@@ -4020,9 +4127,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @Description
      * @param total 总人数
      * @param fz    分子人数
+     * @Description
      * @Author zxc
      * @Date 2022/11/16 10:12
      */
@@ -4262,8 +4369,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
     }
+
     /**
      * 灵山需求
+     *
      * @param houseId ：房屋id
      */
     public void syncHousePartyCenterHouse(String houseId, String resiUserId) {

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>
+    <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>