diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
index 2e65729cab..e576abec7c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
@@ -209,7 +209,7 @@ public class BuildingController {
     @PostMapping("buildingunitlist")
     public Result buildingunitlist(@LoginUser TokenDto tokenDTO,@RequestBody IcBulidingUnitFormDTO icBulidingUnitFormDTO ){
         ValidatorUtils.validateEntity(icBulidingUnitFormDTO);
-        List<IcBuildingUnitEntity> icBuildingUnitEntityList = icBuildingUnitDao.selectList(new QueryWrapper<IcBuildingUnitEntity>().lambda().eq(IcBuildingUnitEntity::getBuildingId, icBulidingUnitFormDTO.getBuildingId()));
+        List<IcBuildingUnitEntity> icBuildingUnitEntityList = icBuildingUnitDao.selectList(new QueryWrapper<IcBuildingUnitEntity>().lambda().eq(IcBuildingUnitEntity::getBuildingId, icBulidingUnitFormDTO.getBuildingId()).orderByAsc(IcBuildingUnitEntity::getUnitNum));
         List<JSONObject> result = new ArrayList<>();
         icBuildingUnitEntityList.forEach(item->{
             JSONObject jsonObject = new JSONObject();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java
index 565b66c23f..15ba83ef46 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java
@@ -91,7 +91,7 @@ public class IcBuildingController {
      * @Date 2021/10/26 14:46
      */
     @PostMapping("buildingoption")
-    public Result<List<OptionResultDTO>> getBuildingOptions(IcBuildingDTO dto) {
+    public Result<List<OptionResultDTO>> getBuildingOptions(@RequestBody IcBuildingDTO dto) {
         return new Result<List<OptionResultDTO>>().ok(icBuildingService.getBuildingOptions(dto.getNeighborHoodId()));
     }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java
index 6d0a832a3c..7ee2138893 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java
@@ -90,7 +90,7 @@ public class IcBuildingUnitController {
      * @Date 2021/10/26 14:46
      */
     @PostMapping("unitoption")
-    public Result<List<OptionResultDTO>> getUnitOptions(IcBuildingUnitDTO dto) {
+    public Result<List<OptionResultDTO>> getUnitOptions(@RequestBody IcBuildingUnitDTO dto) {
         return new Result<List<OptionResultDTO>>().ok(icBuildingUnitService.getUnitOptions(dto.getBuildingId()));
     }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
index cdddab91c8..8af8c48978 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -91,7 +91,7 @@ public class IcNeighborHoodController {
      * @Date 2021/10/26 14:38
      */
     @PostMapping("neighborhoodoption")
-    public Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto) {
+    public Result<List<OptionResultDTO>> getNeighborHoodOptions(@RequestBody IcNeighborHoodDTO dto) {
         return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId()));
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index a1811351c2..0a6f7f50c4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -115,12 +115,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
      */
     @Override
     public List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO) {
-        if (StringUtils.isBlank(formDTO.getUnitId())) {
-            log.error("单元ID为空");
+        if (StringUtils.isBlank(formDTO.getBuildingId()) && StringUtils.isBlank(formDTO.getUnitId())) {
+            log.error("楼栋和单元ID为空");
             return Collections.emptyList();
         }
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
-        //wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
         wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 3f9fc515cf..3d110df7bd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -122,10 +122,10 @@
                 AND a.ID in (select distinct BUILDING_ID from ic_house e
                 <where>
                     <if test="house.ownerName != null and house.ownerName.trim() != ''">
-                        AND e.OWNER_NAME = #{house.ownerName}
+                        AND e.OWNER_NAME like concat('%',#{house.ownerName},'%')
                     </if>
                     <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
-                        AND e.OWNER_PHONE = #{house.ownerPhone}
+                        AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%')
                     </if>
                     and e.DEL_FLAG='0'
                 </where>
@@ -292,11 +292,12 @@
     <!-- 根据neighborHoodId查询楼 -->
     <select id="baseInfoFamilyBuilding" resultType="com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO">
         SELECT
-            id AS buildingId,
-            BUILDING_NAME
-        FROM ic_building
-        WHERE DEL_FLAG  = '0'
-          AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
+            b.id AS buildingId,
+            CONCAT(nh.NEIGHBOR_HOOD_NAME,'-',b.BUILDING_NAME)
+        FROM ic_building b
+        LEFT JOIN ic_neighbor_hood nh ON (nh.ID = b.NEIGHBOR_HOOD_ID AND nh.DEL_FLAG = '0')
+        WHERE b.DEL_FLAG  = '0'
+          AND b.NEIGHBOR_HOOD_ID = #{neighborHoodId}
     </select>
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index f287cd7370..22aea14603 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -134,10 +134,10 @@
                 AND a.BUILDING_ID = #{house.buildingId}
             </if>
             <if test="house.ownerName != null and house.ownerName.trim() != ''">
-                AND a.OWNER_NAME = #{house.ownerName}
+                AND a.OWNER_NAME like concat('%',#{house.ownerName},'%')
             </if>
             <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
-                AND a.OWNER_PHONE = #{house.ownerPhone}
+                AND a.OWNER_PHONE like concat('%',#{house.ownerPhone},'%')
             </if>
             <if test="house.delFlag != null and house.delFlag.trim() != ''">
                 AND a.DEL_FLAG = #{house.delFlag}
@@ -167,10 +167,10 @@
                 AND a.BUILDING_ID = #{house.buildingId}
             </if>
             <if test="house.ownerName != null and house.ownerName.trim() != ''">
-                AND a.OWNER_NAME = #{house.ownerName}
+                AND a.OWNER_NAME like concat('%',#{house.ownerName},'%')
             </if>
             <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
-                AND a.OWNER_PHONE = #{house.ownerPhone}
+                AND a.OWNER_PHONE like concat('%',#{house.ownerPhone},'%')
             </if>
             <if test="house.delFlag != null and house.delFlag.trim() != ''">
                 AND a.DEL_FLAG = #{house.delFlag}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 8c00a943d6..342b567ba7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -91,10 +91,10 @@
                 AND a.ID in (select NEIGHBOR_HOOD_ID from ic_house e
                 <where>
                     <if test="house.ownerName != null and house.ownerName.trim() != ''">
-                        AND e.OWNER_NAME = #{house.ownerName}
+                        AND e.OWNER_NAME  like concat('%',#{house.ownerName},'%')
                     </if>
                     <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
-                        AND e.OWNER_PHONE = #{house.ownerPhone}
+                        AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%')
                     </if>
                     and e.DEL_FLAG='0'
                 </where>
@@ -134,10 +134,10 @@
                 AND a.ID in (select distinct NEIGHBOR_HOOD_ID from ic_house e
                 <where>
                     <if test="house.ownerName != null and house.ownerName.trim() != ''">
-                        AND e.OWNER_NAME = #{house.ownerName}
+                        AND e.OWNER_NAME like concat('%',#{house.ownerName},'%')
                     </if>
                     <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
-                        AND e.OWNER_PHONE = #{house.ownerPhone}
+                        AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%')
                     </if>
                     and e.DEL_FLAG='0'
                 </where>
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DynamicQueryFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DynamicQueryFormDTO.java
new file mode 100644
index 0000000000..42e163838b
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DynamicQueryFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description test
+ * @Author yinzuomei
+ * @Date 2021/11/2 10:38 上午
+ */
+@Data
+public class DynamicQueryFormDTO implements Serializable {
+    private String customerId;
+    private String formCode="resi_base_info";
+    @NotBlank(message = "resultTableName不能为空")
+    private String resultTableName;
+    private List<ResiUserQueryValueDTO> conditions;
+}
+
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 07a88ee80e..da8c7a99eb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -55,6 +55,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -330,21 +331,40 @@ public class IcResiUserController {
         pageFormDTO.setPageFlag(false);
         //PageData<Map<String, Object>> mapPageData = icResiUserService.pageResiMap(pageFormDTO);
         //List<Map<String, Object>> list = mapPageData.getList();
-        List<Map<String, Object>> list = (List<Map<String, Object>>)JSON.parse("[{\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest2\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":null,\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":null,\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":null,\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"},{\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":\"心理咨询\",\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":\"2021-10-28 00:00:00\",\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":\"10180002\",\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"}]"
-               );
-        Map<String, Object> mapData = new HashMap<>();
+        List<Map<String, Object>> list = icResiUserService.dynamicQuery(pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
+        //list = (List<Map<String, Object>>)JSON.parse("[{\"IS_BDHJ\":\"1\",\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest2\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":null,\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":null,\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":null,\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"},{\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":\"心理咨询\",\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":\"2021-10-28 00:00:00\",\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":\"10180002\",\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"}]");
         log.info("list:{}", JSON.toJSONString(list));
 
-        mapData.put("list", list);
+
 
         CustomerFormResultDTO resiFormItems = getResiFormItems(pageFormDTO.getCustomerId());
         String templatePath = "excel/ic_resi_info_cid.xls";
-        TemplateExportParams params = new TemplateExportParams(templatePath, 0,1);
+        TemplateExportParams params = new TemplateExportParams(templatePath,true);
 
-        Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData);
+        Map<Integer,Map<String,Object>> sheetMap = new HashMap<>();
+        Map<String, Object> mapData = new HashMap<>();
+        mapData.put("list", list);
+        sheetMap.put(0,mapData);
+        AtomicInteger n = new AtomicInteger();
+        resiFormItems.getItemList().forEach(item->{
+            if (item.getChildGroup() != null){
+                if (!item.getChildGroup().getTableName().equals(BASE_TABLE_NAME)) {
+                    sheetMap.put( n.incrementAndGet(),mapData);
+                    System.out.println(n.get());
+                }
+            }
+        });
+        for (FormGroupDTO group : resiFormItems.getGroupList()) {
+
+        }
+
+
+
+
+        Workbook workbook = ExcelExportUtil.exportExcel(sheetMap, params);
         //header
         response.setHeader("content-Type", "application/vnd.ms-excel");
-        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("继续追踪导出详情-" + ".xls", "UTF-8"));
+        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("居民信息.xls", "UTF-8"));
         workbook.write(response.getOutputStream());
 
        /* //方式1 通过mv导出
@@ -370,4 +390,12 @@ public class IcResiUserController {
         return new Result().ok(result);
     }
 
+    @PostMapping("test")
+    public Result<List<Map<String,Object>>> test(@LoginUser TokenDto tokenDto,@RequestBody DynamicQueryFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<List<Map<String,Object>>>().ok(icResiUserService.dynamicQuery(formDTO.getCustomerId(),
+                formDTO.getFormCode(),
+                formDTO.getResultTableName(),
+                formDTO.getConditions()));
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 47b63f6eec..1d4f66a4cb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -80,4 +80,19 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     int updateToDel(String icResiUserId);
 
     int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId")String icResiUserId);
+
+    /**
+     * 接口名称
+     *
+     * @param customerId 客户id
+     * @param resultTableName 获取哪个表的数据？？？
+     * @param conditions 前端传入的查询入参
+     * @return  java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @author yinzuomei
+     * @date 2021/11/2 10:35 上午
+     */
+    List<Map<String,Object>> dynamicQuery(@Param("customerId")String customerId,
+                                          @Param("resultTableName")String resultTableName,
+                                          @Param("conditions") List<ResiUserQueryValueDTO> conditions,
+                                          @Param("subTables") List<String> subTables);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index b442e4223f..3cb0adcff7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcResiUserDTO;
-import com.epmet.dto.form.DelIcResiUserFormDTO;
-import com.epmet.dto.form.IcResiDetailFormDTO;
-import com.epmet.dto.form.IcResiUserFormDTO;
-import com.epmet.dto.form.IcResiUserPageFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.HomeUserResultDTO;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.service.impl.IcResiUserServiceImpl;
@@ -132,4 +129,9 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);
 
     Object importExcel(String currUserAgencyId);
+
+    List<Map<String,Object>> dynamicQuery(String customerId,
+                                          String formCode,
+                                          String resultTableName,
+                                          List<ResiUserQueryValueDTO> conditions);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 5cc8c10a05..24a3c6f1d7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -873,4 +873,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
          */
         private String optionSourceValue;
     }
+    public List<Map<String,Object>> dynamicQuery(String customerId,
+                                                 String formCode,
+                                                 String resultTableName,
+                                                 List<ResiUserQueryValueDTO> conditions){
+        CustomerFormQueryDTO queryDTO=new CustomerFormQueryDTO();
+        queryDTO.setCustomerId(customerId);
+        queryDTO.setFormCode(formCode);
+        Result<List<String>> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO);
+        List<String> subTables=new ArrayList<>();
+        if(subTablesRes.success()&&CollectionUtils.isNotEmpty(subTablesRes.getData())){
+            subTables =subTablesRes.getData();
+        }
+        return baseDao.dynamicQuery(customerId,resultTableName,conditions,subTables);
+    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xls
index 51a5d41a94..b6a67b9205 100644
Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xls and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xls differ
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 26e20f7407..616d55e711 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
@@ -104,4 +104,22 @@
     <update id="updateSubTableToDel" parameterType="map">
         update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId}
     </update>
+
+    <select id="dynamicQuery" parameterType="map" resultType="map">
+        select
+            ${resultTableName}.*
+        FROM
+        ic_resi_user
+        <if test="null != subTables and subTables.size() > 0">
+            <foreach item="subTableName" collection="subTables" open="" separator="" close="">
+                ${subTableName}
+            </foreach>
+        </if>
+
+        <where>
+            <include refid="listWhere"></include>
+        </where>
+        group by IC_RESI_USER.id
+        order by ic_resi_user.CREATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file