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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -636,4 +636,8 @@ public class RedisKeys {
 	public static String getOrgTreeCacheKey(String agencyId) {
 		return rootPrefix.concat("org:temp:orgtree").concat(agencyId);
 	}
+
+	public static String getHouseInfoCacheKey(String houseId){
+		return rootPrefix.concat("house:").concat(houseId);
+	}
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PointRecordFormDTO.java

@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -27,12 +28,12 @@ public class PointRecordFormDTO implements Serializable {
      * 开始时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private String startTime;
+    private Date startTime;
     /**
      * 结束时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private String endTime;
+    private Date endTime;
     private Integer pageNo = 1;
     private Integer pageSize = 10;
     private String customerId;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java

@@ -27,7 +27,7 @@ public class IcPartyUnitCompletionController {
     private IcPartyUnitCompletionService icPartyUnitCompletionService;
 
     @PostMapping("list")
-    public Result<PageData<IcPartyUnitCompletionDTO>> page(@RequestParam CompletionFormDTO formDTO){
+    public Result<PageData<IcPartyUnitCompletionDTO>> page(@RequestBody CompletionFormDTO formDTO){
         PageData<IcPartyUnitCompletionDTO> page = icPartyUnitCompletionService.page(formDTO);
         return new Result<PageData<IcPartyUnitCompletionDTO>>().ok(page);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@@ -128,5 +128,5 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
      */
     List<PointRecordDTO> getPointRecordList(PointRecordFormDTO formDTO);
 
-    int getTotalPoint(PointRecordFormDTO formDTO);
+    Integer getTotalPoint(PointRecordFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -1662,9 +1662,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             result.setTotalPoint(NumConstant.ZERO);
             result.setPage(new PageData<>(Collections.emptyList(), NumConstant.ZERO));
         }
-
+        Integer total = baseDao.getTotalPoint(formDTO);
         //总积分
-        result.setTotalPoint(baseDao.getTotalPoint(formDTO));
+        result.setTotalPoint(null == total?NumConstant.ZERO:total);
         //分页查询
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<PointRecordDTO> list = baseDao.getPointRecordList(formDTO);

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java

@@ -71,4 +71,9 @@ public class HouseInfoDTO implements Serializable {
      * 楼的纬度
      */
     private String buildingLatitude;
+
+    /**
+     * 小区名+楼栋名+单元名+房屋名
+     */
+    private String allName;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -59,6 +59,8 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
 
     List<HouseInfoDTO> queryHouseInfo(@Param("houseIdList") Set<String> houseIdList);
 
+    HouseInfoDTO queryHouseInfoByHouseId(@Param("houseId") String houseId);
+
     /**
      * @Description  查询房屋信息
      * @param idCard

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java

@@ -17,9 +17,17 @@
 
 package com.epmet.redis;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcHouseDao;
+import com.epmet.dto.result.HouseInfoDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Map;
 
 /**
  * 房屋信息
@@ -32,6 +40,9 @@ public class IcHouseRedis {
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    private IcHouseDao icHouseDao;
+
     public void delete(Object[] ids) {
 
     }
@@ -44,4 +55,28 @@ public class IcHouseRedis {
         return null;
     }
 
+    /**
+     * @Description  往缓存放房屋信息
+     * @param houseId
+     * @param map
+     * @author zxc
+     * @date 2022/1/18 3:55 下午
+     */
+    public void setHouseInfo(String houseId, Map<String, Object> map){
+        String key = RedisKeys.getHouseInfoCacheKey(houseId);
+        redisUtils.hMSet(key, map);
+    }
+
+    public HouseInfoDTO getHouseInfo(String houseId){
+        String key = RedisKeys.getHouseInfoCacheKey(houseId);
+        Map<String, Object> map = redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(map)){
+            return ConvertUtils.mapToEntity(map,HouseInfoDTO.class);
+        }
+        HouseInfoDTO houseInfo = icHouseDao.queryHouseInfoByHouseId(houseId);
+        Map<String, Object> result = BeanUtil.beanToMap(houseInfo, false, true);
+        setHouseInfo(houseId,result);
+        return houseInfo;
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -31,6 +32,7 @@ import com.epmet.enums.HouseRentFlagEnums;
 import com.epmet.enums.HouseTypeEnums;
 import com.epmet.excel.IcHouseExcel;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.HouseService;
 import com.epmet.service.IcBuildingService;
 import com.epmet.service.IcBuildingUnitService;
@@ -69,6 +71,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     private IcHouseDao icHouseDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private IcHouseRedis icHouseRedis;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -313,6 +317,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if(org.apache.commons.collections4.CollectionUtils.isEmpty(houseIdList)){
             return new ArrayList<>();
         }
-        return icHouseDao.queryHouseInfo(houseIdList);
+        List<HouseInfoDTO> result = new ArrayList<>();
+        houseIdList.forEach(h -> {
+            result.add(icHouseRedis.getHouseInfo(h));
+        });
+        return result;
     }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -300,4 +300,28 @@
             and ih.id !=#{houseId}
         </if>
     </select>
+    <select id="queryHouseInfoByHouseId" resultType="com.epmet.dto.result.HouseInfoDTO">
+        SELECT
+        ih.ID as homeId,
+        IFNULL(n.ADDRESS,'') as neighborAddress,
+        ih.NEIGHBOR_HOOD_ID as neighborHoodId,
+        IFNULL(n.NEIGHBOR_HOOD_NAME,'') as neighborHoodName,
+        ih.BUILDING_ID as buildingId,
+        IFNULL(ib.BUILDING_NAME,'') as buildingName,
+        ih.BUILDING_UNIT_ID as buildingUnitId,
+        IFNULL(u.UNIT_NAME,'') as unitName,
+        IFNULL(ih.DOOR_NAME,'') as doorName,
+        ih.house_type,
+        IFNULL(ih.HOUSE_NAME,'') as HOUSE_NAME,
+        IFNULL(ib.LONGITUDE,'') as buildingLongitude,
+        IFNULL(ib.LATITUDE,'') as buildingLatitude,
+        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName
+        FROM ic_house ih
+        left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id )
+        left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id )
+        left JOIN ic_building_unit u ON ( ih.BUILDING_UNIT_ID = u.ID )
+        WHERE
+        ih.DEL_FLAG = '0'
+        AND ih.ID = #{houseId}
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,6 +40,9 @@ public class PersonWarnRightListResultDTO implements Serializable {
          */
         private String gridName;
 
+        @JsonIgnore
+        private String gridId;
+
         /**
          * 姓名
          */
@@ -49,6 +53,9 @@ public class PersonWarnRightListResultDTO implements Serializable {
          */
         private String family;
 
+        @JsonIgnore
+        private String homeId;
+
         /**
          * 电话
          */

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

@@ -231,4 +231,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<VolunteerDistributionResultDTO.Distribution> listIcResiInfosByUserIds(@Param("userIds") List<String> userIds);
 
     Map<String, String> getCategoryListMap(@Param("icUserId") String icUserId);
+
+    List<Map<String,Object>> selectResiUsers(@Param("types")List<String> types,@Param("orgId")String orgId);
 }

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

@@ -1099,7 +1099,68 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      */
     @Override
     public PersonWarnRightListResultDTO personWarnRightList(PersonWarnRightListFormDTO formDTO, TokenDto tokenDto) {
-        return null;
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException(String.format("未查询到此工作人员信息%s",tokenDto.getUserId()));
+        }
+        Result<List<CustomerCategoryShowAndWarnListResultDTO>> configListResult = operCustomizeOpenFeignClient.getCustomerCategoryShowAndWarnList(tokenDto.getCustomerId());
+        if (!configListResult.success()){
+            throw new EpmetException("查询居民分类配置失败...");
+        }
+        PersonWarnRightListResultDTO result = new PersonWarnRightListResultDTO();
+        if (CollectionUtils.isEmpty(configListResult.getData())){
+            return result;
+        }
+        List<CustomerCategoryShowAndWarnListResultDTO> configList = configListResult.getData();
+        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(configList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId()));
+        List<Map<String, Object>> list = pageInfo.getList();
+        if (CollectionUtils.isEmpty(list)) {
+            return result;
+        }
+        result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
+        List<PersonWarnRightListResultDTO.PersonWarnRightList> userList = disposeCategory(list, configList);
+        Result<List<HouseInfoDTO>> houseInfosResult = govOrgOpenFeignClient.queryListHouseInfo(userList.stream().distinct().map(m -> m.getHomeId()).collect(Collectors.toSet()));
+        if (!houseInfosResult.success()){
+            throw new EpmetException("查询房屋信息失败...");
+        }
+        List<HouseInfoDTO> houseInfos = houseInfosResult.getData();
+        userList.forEach(u -> houseInfos.stream().filter(h -> h.getHomeId().equals(u.getHomeId())).forEach(h -> u.setFamily(h.getNeighborHoodName()+h.getBuildingName()+h.getUnitName()+h.getHouseName())));
+        result.setList(userList);
+        return result;
+    }
+
+    /**
+     * @Description  居民分类 和 网格名 处理
+     * @param list
+     * @param configList
+     * @author zxc
+     * @date 2022/1/18 3:22 下午
+     */
+    public List<PersonWarnRightListResultDTO.PersonWarnRightList> disposeCategory(List<Map<String, Object>> list,List<CustomerCategoryShowAndWarnListResultDTO> configList){
+        List<PersonWarnRightListResultDTO.PersonWarnRightList> userList = new ArrayList<>();
+        list.forEach(l -> {
+            PersonWarnRightListResultDTO.PersonWarnRightList dto = ConvertUtils.mapToEntity(l, PersonWarnRightListResultDTO.PersonWarnRightList.class);
+            // 分类名字
+            List<String> types = new ArrayList<>();
+            configList.forEach(c -> {
+                l.forEach((k,v) -> {
+                    if (c.getColumnName().equals(k) && null != v && v.equals(NumConstant.ONE_STR)){
+                        types.add(c.getLabel());
+                    }
+                });
+            });
+            // 只显示有类别的居民
+            if (CollectionUtils.isNotEmpty(types)){
+                dto.setType(types);
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                if (null == gridInfo){
+                    throw new EpmetException(String.format("查询网格信息失败%s",dto.getGridId()));
+                }
+                dto.setGridName(gridInfo.getGridNamePath());
+                userList.add(dto);
+            }
+        });
+        return userList;
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.23__ic_user_transfer_and_change.sql

@@ -0,0 +1,96 @@
+
+ALTER TABLE `ic_resi_user`
+ADD COLUMN `STATUS`  varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '用户状态【0:正常 1:转出】' AFTER `JTXX_REMAKES`;
+
+ALTER TABLE `ic_resi_user`
+DROP INDEX `customer_idcard_unique`;
+
+CREATE TABLE `ic_user_transfer_record` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `IC_USER_ID` varchar(64) NOT NULL COMMENT '被调动人Id【ic_resi_user表id】',
+  `OPERATOR_ID` varchar(64) NOT NULL COMMENT '调动(工作)人员Id【customer_staff表userId】',
+  `IC_USER_NAME` varchar(64) NOT NULL COMMENT '被调动人名称【ic_resi_user表name】',
+  `OPERATOR_NAME` varchar(64) NOT NULL COMMENT '调动(工作)人员名称【customer_staff表real_name】',
+  `OLD_CUSTOMER_ID` varchar(64) NOT NULL COMMENT '调动前客户Id',
+  `NEW_CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '调动后客户Id',
+  `OLD_AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '调动前组织Id',
+  `NEW_AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '调动后组织Id',
+  `OLD_AGENCY_NAME` varchar(64) DEFAULT NULL COMMENT '调动前组织名称',
+  `NEW_AGENCY_NAME` varchar(255) DEFAULT NULL COMMENT '调动后组织名称',
+  `OLD_GRID_ID` varchar(64) DEFAULT NULL COMMENT '调动前网格Id',
+  `NEW_GRID_ID` varchar(64) DEFAULT NULL COMMENT '调动后网格Id',
+  `OLD_GRID_NAME` varchar(255) DEFAULT NULL COMMENT '调动前网格名称',
+  `NEW_GRID_NAME` varchar(255) DEFAULT NULL COMMENT '调动后网格名称',
+  `OLD_NEIGHBOR_HOOD_ID` varchar(64) DEFAULT NULL COMMENT '调动前小区Id',
+  `NEW_NEIGHBOR_HOOD_ID` varchar(64) DEFAULT NULL COMMENT '调动后小区Id',
+  `OLD_NEIGHBOR_HOOD_NAME` varchar(255) DEFAULT NULL COMMENT '调动前小区名称',
+  `NEW_NEIGHBOR_HOOD_NAME` varchar(255) DEFAULT NULL COMMENT '调动后小区名称',
+  `OLD_BUILDING_ID` varchar(64) DEFAULT NULL COMMENT '调动前楼栋Id',
+  `NEW_BUILDING_ID` varchar(64) DEFAULT NULL COMMENT '调动后楼栋Id',
+  `OLD_BUILDING_NAME` varchar(255) DEFAULT NULL COMMENT '调动前楼栋名称',
+  `NEW_BUILDING_NAME` varchar(255) DEFAULT NULL COMMENT '调动后楼栋名称',
+  `OLD_BUILDING_UNIT_ID` varchar(64) DEFAULT NULL COMMENT '调动前单元Id',
+  `NEW_BUILDING_UNIT_ID` varchar(64) DEFAULT NULL COMMENT '调动后单元Id',
+  `OLD_BUILDING_UNIT_NAME` varchar(255) DEFAULT NULL COMMENT '调动前单元名称',
+  `NEW_BUILDING_UNIT_NAME` varchar(255) DEFAULT NULL COMMENT '调动后单元名称',
+  `OLD_HOUSE_ID` varchar(64) DEFAULT NULL COMMENT '调动前房屋Id',
+  `NEW_HOUSE_ID` varchar(64) DEFAULT NULL COMMENT '调动后房屋Id',
+  `OLD_HOUSE_NAME` varchar(255) DEFAULT NULL COMMENT '调动前房屋名称',
+  `NEW_HOUSE_NAME` varchar(255) DEFAULT NULL COMMENT '调动后房屋名称',
+  `TRANSFER_TIME` datetime NOT NULL COMMENT '调动时间',
+  `REMARK` varchar(512) DEFAULT NULL COMMENT '备注说明',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='居民调动记录表';
+
+CREATE TABLE `ic_user_change_record` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `IC_USER_TRANSFER_RECORD_ID` varchar(64) DEFAULT NULL COMMENT '调动表Id【只有调动记录此列才有值】',
+  `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '当前所属客户Id[迁出客户的此列没值]',
+  `OPERATOR_ID` varchar(64) NOT NULL COMMENT '操作人Id【customer_staff表userId】',
+  `IC_USER_ID` varchar(64) NOT NULL COMMENT '被操作人Id【ic_resi_user表id】',
+  `OPERATOR_NAME` varchar(64) NOT NULL COMMENT '操作人名称【customer_staff表real_name】',
+  `IC_USER_NAME` varchar(64) NOT NULL COMMENT '被操作人名称【ic_resi_user表name】',
+  `TYPE` varchar(64) NOT NULL COMMENT '操作类型【add:新增  category:类别   transfer:调动】',
+  `TYPE_NAME` varchar(64) NOT NULL COMMENT '操作类型名称【add:新增  category:类别  transfer:调动】',
+  `BEFORE_CHANGE_NAME` varchar(512) DEFAULT NULL COMMENT '变更前文字描述',
+  `AFTER_CHANGE_NAME` varchar(512) DEFAULT NULL COMMENT '变更后文字描述',
+  `CHANGE_TIME` datetime NOT NULL COMMENT '调整时间',
+  `REMARK` varchar(512) DEFAULT NULL COMMENT '备注说明',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='居民变更记录表';
+
+CREATE TABLE `ic_user_change_detailed` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+  `IC_USER_CHANGE_RECORD_ID` varchar(64) NOT NULL COMMENT '变更记录表主键【ic_user_change_record.id】',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id',
+  `NEIGHBOR_HOOD_ID` varchar(64) NOT NULL COMMENT '小区Id',
+  `BUILDING_ID` varchar(64) NOT NULL COMMENT '楼栋Id',
+  `BUILDING_UNIT_ID` varchar(64) NOT NULL COMMENT '单元Id',
+  `HOUSE_ID` varchar(64) NOT NULL COMMENT '房屋Id',
+  `IC_USER_ID` varchar(64) NOT NULL COMMENT '变更人Id',
+  `TYPE` varchar(255) NOT NULL COMMENT '操作类型【add:新增  category:类别   in:迁入 out:迁出】',
+  `TYPE_NAME` varchar(255) NOT NULL COMMENT '操作类型名称【add:新增  category:类别   in:迁入 out:迁出】',
+  `FIELD_NAME` varchar(64) NOT NULL COMMENT '字段名【18类对应的ic_resi_user表字段名】',
+  `VALUE` int(3) NOT NULL COMMENT '当前类别的值',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='变更明细表\r\n[一条变更记录对应多条人员类别数据]';

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

@@ -540,5 +540,24 @@
             del_flag = '0'
         AND id = #{icUserId}
     </select>
+    <select id="selectResiUsers" resultType="java.util.Map">
+        SELECT
+            ID AS userId,
+            GRID_ID AS gridId,
+            HOME_ID AS homeId,
+            `NAME` AS name,
+            MOBILE AS mobile,
+            <foreach collection="types" item="t" separator=",">
+                ${t}
+            </foreach>
+        FROM ic_resi_user
+        WHERE DEL_FLAG = 0
+          AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
+          AND(
+          <foreach collection="types" item="t" separator="OR">
+              (${t} IS NOT NULL AND ${t} != 0)
+          </foreach>)
+        ORDER BY CREATED_TIME DESC
+    </select>
 
 </mapper>