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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -507,4 +507,13 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/icneighborhood/neighborhoodoption")
     Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @PostMapping("/gov/org/ichouse/selecthouseinfobyidcard")
+    Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -305,6 +305,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getNeighborHoodOptions", dto);
     }
 
+    @Override
+    public Result<List<String>> selectHouseInfoByIdCard(String idCard) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@@ -88,4 +88,15 @@ public class IcHouseController {
         return new Result<List<OptionResultDTO>>().ok(icHouseService.getHouseOption(formDTO));
     }
 
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @PostMapping("selecthouseinfobyidcard")
+    public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard){
+        return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard));
+    }
+
 }

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

@@ -52,4 +52,13 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<IcHouseExcel> searchAllHouse(@Param("house") IcHouseEntity house);
 
     List<HouseInfoDTO> queryHouseInfo(@Param("houseIdList") Set<String> houseIdList);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard);
+
 }

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

@@ -103,4 +103,13 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @Date 2021/10/25 17:04
      */
     List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    List<String> selectHouseInfoByIdCard(String idCard);
+
 }

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

@@ -36,10 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -135,4 +132,19 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @Override
+    public List<String> selectHouseInfoByIdCard(String idCard) {
+        List<String> result = baseDao.selectHouseInfoByIdCard(idCard);
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
 }

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

@@ -252,4 +252,16 @@
             ih.ID = #{houseId}
         </foreach>
     </select>
+
+    <!-- 查询房屋信息 -->
+    <select id="selectHouseInfoByIdCard" resultType="java.lang.String">
+        SELECT
+            CONCAT(inh.NEIGHBOR_HOOD_NAME,ib.BUILDING_NAME,ibu.UNIT_NAME,ih.HOUSE_NAME)
+        FROM ic_house ih
+        LEFT JOIN ic_neighbor_hood inh ON (inh.ID = ih.NEIGHBOR_HOOD_ID AND inh.DEL_FLAG = '0')
+        LEFT JOIN ic_building ib ON (ib.ID = ih.BUILDING_ID AND ib.DEL_FLAG = '0')
+        LEFT JOIN ic_building_unit ibu ON (ibu.ID = ih.BUILDING_UNIT_ID AND ibu.DEL_FLAG = '0')
+        WHERE ih.DEL_FLAG = '0'
+          AND ih.OWNER_ID_CARD = #{idCard}
+    </select>
 </mapper>

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ColumnTableNameResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description  查询必填字段-接口返参
+ * @Author sun
+ */
+@Data
+public class ColumnTableNameResultDTO implements Serializable {
+    private static final long serialVersionUID = -8441112171986914418L;
+    //表名
+    private String tableName;
+    //字段中文名
+    private String label;
+    //字段名
+    private String columnName;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -11,6 +11,7 @@ import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -88,4 +89,12 @@ public interface OperCustomizeOpenFeignClient {
      */
     @PostMapping("/oper/customize/icform/items")
     Result<List<FormItem>> listItems(@RequestBody CustomerFormQueryDTO formDto);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @PostMapping("/oper/customize/icformitem/getmustcolumn/{customerId}")
+    Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable("customerId") String customerId);
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -74,4 +74,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	public Result<List<FormItem>> listItems(CustomerFormQueryDTO formDto) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listItems", formDto);
 	}
+
+	@Override
+	public Result<List<ColumnTableNameResultDTO>> getMustColumn(String customerId) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getMustColumn", customerId);
+	}
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcFormItemDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
+import com.epmet.dto.result.CustomerStaffRoleResultDTO;
 import com.epmet.excel.IcFormItemExcel;
 import com.epmet.service.IcFormItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,13 @@ public class IcFormItemController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemExcel.class);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @PostMapping("getmustcolumn/{customerId}")
+    public Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable String customerId) {
+        return new Result<List<ColumnTableNameResultDTO>>().ok(icFormItemService.getMustColumn(customerId));
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -64,4 +65,10 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
     List<String> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 
     Set<String> queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    List<ColumnTableNameResultDTO> getMustColumn(@Param("customerId")String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -115,4 +116,10 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
     List<String> querySubTables(String customerId, String formCode);
 
     Set<String> queryIcResiSubTables(String customerId, String formCode);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    List<ColumnTableNameResultDTO> getMustColumn(String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormItemDao;
 import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -128,6 +129,14 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
             list.addAll(result);
         }
         //list.add(new TableHeaderResultDTO("需求分类","DEMAND_NAME","input"));
+        TableHeaderResultDTO categoryName=new TableHeaderResultDTO();
+        categoryName.setItemType("input");
+        categoryName.setItemId(StrConstant.EPMETY_STR);
+        categoryName.setColumnName("CATEGORY_NAME");
+        categoryName.setLabel("居民需求");
+        categoryName.setOptions(new ArrayList<>());
+        list.add(categoryName);
+
         TableHeaderResultDTO houseType=new TableHeaderResultDTO();
         houseType.setItemType("input");
         houseType.setItemId(StrConstant.EPMETY_STR);
@@ -153,4 +162,13 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         return baseDao.queryIcResiSubTables(customerId,formCode);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @Override
+    public List<ColumnTableNameResultDTO> getMustColumn(String customerId) {
+        return baseDao.getMustColumn(customerId);
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -141,4 +141,21 @@
             AND m.CUSTOMER_ID = #{customerId}
           AND m.FORM_CODE = #{formCode}
     </select>
+
+    <select id="getMustColumn" resultType="com.epmet.dto.result.ColumnTableNameResultDTO">
+        SELECT
+            a.label "label",
+            a.column_name "columnName",
+        IF (
+            ('' = b.table_name OR b.table_name IS NULL ), 'ic_resi_user', b.table_name
+        ) "tableName"
+        FROM
+            ic_form_item a
+        LEFT JOIN ic_form_item_group b ON a.item_group_id = b.id
+        WHERE
+            a.del_flag = '0'
+        AND a.required = '1'
+        AND a.customer_id = #{customerId}
+    </select>
+
 </mapper>

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

@@ -34,5 +34,8 @@ public class IcResiUserPageFormDTO implements Serializable {
      */
     private List<ResiUserQueryValueDTO> conditions;
     private Boolean pageFlag;
+
+    @NotBlank(message = "当前用户id不能为空", groups = AddUserInternalGroup.class)
+    private String staffId;
 }
 

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

@@ -52,7 +52,10 @@ public class PersonDataResultDTO implements Serializable {
     /**
      * 志愿者类别
      */
-    private String volunteerCategory;
+    private List<String> volunteerCategory;
+
+    @JsonIgnore
+    private List<String> volunteerCategoryEn;
 
     public PersonDataResultDTO() {
         this.workUnit = "";
@@ -61,7 +64,7 @@ public class PersonDataResultDTO implements Serializable {
         this.name = "";
         this.financialSituation = new FinancialSituationDTO();
         this.houseInfo = new ArrayList<>();
-        this.volunteerCategory = "";
+        this.volunteerCategory = new ArrayList<>();
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -307,6 +307,7 @@ public class IcResiUserController {
     public Result<PageData<Map<String,Object>>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         pageFormDTO.setCustomerId(tokenDto.getCustomerId());
+        pageFormDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(pageFormDTO,IcResiUserPageFormDTO.AddUserInternalGroup.class);
         return new Result<PageData<Map<String,Object>>>().ok(icResiUserService.pageResiMap(pageFormDTO));
     }
@@ -328,45 +329,57 @@ public class IcResiUserController {
 
     @RequestMapping(value = "/exportExcel")
     public void exportExcel(/*@LoginUser TokenDto tokenDto,*/ @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws IOException {
-
         pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         pageFormDTO.setPageFlag(false);
         CustomerFormResultDTO resiFormItems = getResiFormItems(pageFormDTO.getCustomerId());
 
-        Map<String, FormItem> itemMap = new HashMap<>();
+        Map<String, Map<String, FormItem>> otherSheetItems = new HashMap<>();
+
+        //主表的
         for (FormItem formItem : resiFormItems.getItemList()) {
-            if (StringUtils.isNotBlank(formItem.getColumnName())){
+            if (StringUtils.isBlank(formItem.getColumnName())){
                 continue;
             }
-            if  (formItem.getItemType().equals("checkbox") || formItem.getItemType().equals("select")){
+
+            Map<String, FormItem> itemMap = otherSheetItems.getOrDefault(formItem.getTableName(),new HashMap<>());
+            otherSheetItems.putIfAbsent(formItem.getTableName(),itemMap);
+            if  (formItem.getItemType().equals("checkbox") || formItem.getItemType().equals("select") || formItem.getItemType().equals("radio")){
                 itemMap.put(formItem.getColumnName().concat(formItem.getColumnNum() == 0 ? "" : formItem.getColumnNum().toString()), formItem);
             }
             if (formItem.getChildGroup() != null) {
+                itemMap = otherSheetItems.getOrDefault(formItem.getChildGroup().getTableName(),new HashMap<>());
+                otherSheetItems.putIfAbsent(formItem.getChildGroup().getTableName(),itemMap);
                 for (FormItem2 item2 : formItem.getChildGroup().getItemList()) {
-                    if (StringUtils.isNotBlank(item2.getColumnName())){
+                    if (StringUtils.isBlank(item2.getColumnName())){
                         continue;
                     }
-                    if  (item2.getItemType().equals("checkbox") || item2.getItemType().equals("select")){
+
+                    if  (item2.getItemType().equals("checkbox") || item2.getItemType().equals("select") || item2.getItemType().equals("radio")){
                         itemMap.put(item2.getColumnName().concat(item2.getColumnNum() == 0 ? "" : item2.getColumnNum().toString()), ConvertUtils.sourceToTarget(item2,FormItem.class));
                     }
                 }
 
             }
         }
+        //其他sheet
+
         for (FormGroupDTO groupItem : resiFormItems.getGroupList()) {
-            if (groupItem.getItemList() != null) {
-                for (FormItem2 item : groupItem.getItemList()) {
-                    if (StringUtils.isNotBlank(item.getColumnName())){
-                        continue;
-                    }
-                    if  (item.getItemType().equals("checkbox") || item.getItemType().equals("select")){
-                        itemMap.put(item.getColumnName().concat(item.getColumnNum() == 0 ? "" : item.getColumnNum().toString()), ConvertUtils.sourceToTarget(item, FormItem.class));
-                    }
+            if (groupItem.getItemList() == null) {
+                continue;
+            }
+            Map<String, FormItem> itemMap = otherSheetItems.getOrDefault(groupItem.getTableName(),new HashMap<>());
+            otherSheetItems.putIfAbsent(groupItem.getTableName(),itemMap);
+            for (FormItem2 formItem2 : groupItem.getItemList()) {
+                if (StringUtils.isBlank(formItem2.getColumnName())) {
+                    continue;
+                }
+                if (formItem2.getItemType().equals("checkbox") || formItem2.getItemType().equals("select")|| formItem2.getItemType().equals("radio")) {
+                    itemMap.put(formItem2.getColumnName().concat(formItem2.getColumnNum() == 0 ? "" : formItem2.getColumnNum().toString()), ConvertUtils.sourceToTarget(formItem2, FormItem.class));
                 }
             }
         }
-        System.out.println("checkbox:"+JSON.toJSONString(itemMap));
-        Map<String,Map<String, Object>> resiMainList = icResiUserService.getDataForExport(itemMap,pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
+
+        Map<String,Map<String, Object>> resiMainList = icResiUserService.getDataForExport(otherSheetItems.get(BASE_TABLE_NAME),pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
         //resiMainList = (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("resiMainList:{}", JSON.toJSONString(resiMainList));
         String templatePath = "excel/ic_resi_info_cid.xls";
@@ -379,21 +392,14 @@ public class IcResiUserController {
         AtomicInteger n = new AtomicInteger();
         for (FormItem item : resiFormItems.getItemList()) {
 
-
             if (item.getChildGroup() != null) {
                 if (!item.getChildGroup().getTableName().equals(BASE_TABLE_NAME)) {
-                    //itemMap = item.getChildGroup().getItemList().stream().filter(o -> o.getItemType().equals("checkbox")).collect(Collectors.toMap(o -> o.getColumnName().concat(o.getColumnNum() == 0 ? "" : o.getColumnNum().toString()), o -> ConvertUtils.sourceToTarget(o,FormItem.class)));
-
-
-
-                    Map<String,Map<String, Object>> resiChildMap = icResiUserService.getDataForExport(itemMap, pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), item.getChildGroup().getTableName(), pageFormDTO.getConditions());
-                    resiChildMap.forEach((key,value)->{
-                        value.putAll(resiMainList.get(key));
-                    });
+                    Map<String, FormItem> itemMap1 = otherSheetItems.get(item.getChildGroup().getTableName());
+                    Map<String,Map<String, Object>> resiChildMap = icResiUserService.getDataForExport(itemMap1, pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), item.getChildGroup().getTableName(), pageFormDTO.getConditions());
+                    resiChildMap.forEach((key,value)-> value.putAll(resiMainList.get(key)));
 
                     Map<String, Object> mapData2 = new HashMap<>();
                     mapData2.put("list", resiChildMap.values());
-                    System.out.println("========="+item.getChildGroup().getTableName()+" data:"+resiChildMap.size());
                     sheetMap.put(n.incrementAndGet(),mapData2);
                 }
             }

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

@@ -28,6 +28,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 用户基础信息
@@ -54,7 +55,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                @Param("formCode") String formCode,
                                                @Param("conditions") List<ResiUserQueryValueDTO> conditions,
                                                @Param("resultColumns") List<IcFormResColumnDTO> resultColumns,
-                                               @Param("subTables") List<String> subTables);
+                                               @Param("subTables") List<String> subTables,
+                                               @Param("currentStaffAgencyId")String currentStaffAgencyId,
+                                               @Param("staffOrgPath") String staffOrgPath);
     /**
      * 查询主表
      *
@@ -115,4 +118,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<SearchByNameResultDTO> searchByName(@Param("name")String name, @Param("agencyId")String agencyId,@Param("pageNo")Integer pageNo);
 
+    Set<String> selectUserDemandCode(String icResiUserId);
+
+    String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
 }

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

@@ -92,10 +92,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
-    
+
     @Autowired
     private LoginUserUtil loginUserUtil;
-    
+
     @Override
     public PageData<IcResiUserDTO> page(Map<String, Object> params) {
         IPage<IcResiUserEntity> page = baseDao.selectPage(
@@ -162,6 +162,28 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Transactional(rollbackFor = Exception.class)
     public void add(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO) {
         //循环自动拼接sql语句，往多个表新增数据
+        //0.校验必填字段是否为空
+        Result<List<ColumnTableNameResultDTO>> resultList = operCustomizeOpenFeignClient.getMustColumn(tokenDto.getCustomerId());
+        if (resultList.success() && null != resultList.getData()) {
+            StringBuffer str = new StringBuffer("");
+            formDTO.forEach(f -> {
+                resultList.getData().forEach(l -> {
+                    if (f.getTableName().equals(l.getTableName())) {
+                        f.getList().forEach(map -> {
+                            if (!map.containsKey(l.getColumnName())) {
+                                str.append(str.length() < NumConstant.ONE ? l.getLabel() : "、" + l.getLabel());
+                            }
+                        });
+                    }
+                });
+            });
+            if (str.length() > NumConstant.ZERO ) {
+                throw new RenException(String.format("新增居民信息,必要字段值为空,%s值为空", str));
+            }
+        } else {
+            throw new RenException(String.format("新增居民信息-根据客户Id查询必填信息失败，customerId->%s", tokenDto.getCustomerId()));
+        }
+
         //1.先往主表新增数据
         //主表Id
         String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");
@@ -293,6 +315,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
+        String staffOrgPath=StrConstant.EPMETY_STR;
+        if(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds())&& !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())){
+            staffOrgPath=staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
+        }
+
         // 查询列表展示项，如果没有，直接返回
         CustomerFormQueryDTO queryDTO1=new CustomerFormQueryDTO();
         queryDTO1.setCustomerId(formDTO.getCustomerId());
@@ -309,18 +337,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         PageInfo<Map<String, Object>> pageInfo=new PageInfo<>();
         if (null == formDTO.getPageFlag()||formDTO.getPageFlag()) {
             //分页
+            String finalStaffOrgPath = staffOrgPath;
             pageInfo= PageHelper.startPage(formDTO.getPageNo(),
                     formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
-                    subTables));
+                    subTables,
+                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath
+                    ));
         }else{
             List<Map<String,Object>> list=baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
-                    subTables);
+                    subTables,staffInfoCacheResult.getAgencyId(),
+                    staffOrgPath);
             pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size());
             pageInfo.setList(list);
         }
@@ -380,8 +412,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 } else if (HouseTypeEnum.BIESHU.getCode().equals(houseType)) {
                     resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.BIESHU.getName());
                 }
-
                 resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName));
+
+                resultMap.put("CATEGORY_NAME",queryUserDemandName(formDTO.getCustomerId(),(String) resultMap.get("icResiUserId")));
             }
 
             if (resultMap.containsKey(UserConstant.GENDER)) {
@@ -399,6 +432,24 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
 
+    private String queryUserDemandName(String customerId,String icResiUserId) {
+        Set<String> demandCodePath=baseDao.selectUserDemandCode(icResiUserId);
+        if(CollectionUtils.isEmpty(demandCodePath)){
+            return StrConstant.EPMETY_STR;
+        }
+        Set<String> codeSet=new HashSet<>();
+        for(String codePath:demandCodePath){
+            if(codePath.contains(StrConstant.COMMA)){
+                String[] codeAtt=codePath.split(StrConstant.COMMA);
+                codeSet.add(codeAtt[codeAtt.length-1]);
+            }else{
+                codeSet.add(codePath);
+            }
+        }
+        String demandName=baseDao.selectCategoryNames(customerId,codeSet);
+        return  demandName;
+    }
+
     /**
      * 编辑页面，显示居民信息详情
      *
@@ -435,9 +486,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public Object importIcResiInfoFromExcel(String currUserAgencyId) {
+        String excelPathName = "/opt/test/基础信息表/resi_info.xls";
         CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(currUserAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
         String loginUserId = loginUserUtil.getLoginUserId();
-        return importIcResiInfoFromExcel(0, 3, currUserAgencyId, agencyInfo.getPids(), loginUserId);
+
+        //return importIcResiInfoFromExcel(excelPathName, 0, 3, currUserAgencyId, agencyInfo.getPids(), loginUserId);
+        return importIcResiExtraInfoFromExcel(excelPathName, 1, 2, currUserAgencyId, agencyInfo.getPids(), loginUserId);
 //        imporExcel(1, 1);
 //        imporExcel(2, 1);
 //        imporExcel(3, 1);
@@ -448,9 +502,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 //        imporExcel(8, 1);
     }
 
-    private Object importIcResiInfoFromExcel(int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId) {
+    /**
+     * excel导入居民基本信息
+     * @param sheetNo
+     * @param headRowNumber
+     * @param currUserAgencyId
+     * @param currUserAgencyPids
+     * @param currentUserId
+     * @return
+     */
+    private Object importIcResiInfoFromExcel(String excelPathName, int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId) {
         DynamicEasyExcelListener readListener = new DynamicEasyExcelListener();
-        EasyExcelFactory.read(new File("/opt/test/基础信息表/resi_info.xls")).registerReadListener(readListener).headRowNumber(3).sheet(sheetNo).doRead();
+        EasyExcelFactory.read(new File(excelPathName)).registerReadListener(readListener).headRowNumber(headRowNumber).sheet(sheetNo).doRead();
 
         List<Map<Integer, String>> headList = readListener.getHeadList();
         List<Map<Integer, String>> dataList = readListener.getDataList();
@@ -458,10 +521,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Map<Integer, List<String>> headers = mergeHead(headList);
 
         // 查询form相关信息
-        CustomerFormQueryDTO form = new CustomerFormQueryDTO();
-        form.setFormCode("resi_base_info");
-        Result<List<FormItem>> result = operCustomizeOpenFeignClient.listItems(form);
-        List<FormItem> customerItems = getResultDataOrThrowsException(result, ServiceConstant.OPER_CUSTOMIZE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【居民信息excel导入】查询表单相关信息失败");
+        List<FormItem> customerItems = listFormItems("resi_base_info");
 
         // 清洗表头数据
         Map<Integer, String> abandonedHeaders = washHeaders(headers, customerItems);
@@ -481,12 +541,57 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     }
                 }, formItem -> formItem)
         );
-        Map<String, ColumnWrapper> headerColumnWrapper = integrate(formItemMap, combinedHeaders, dataList, abandonedHeaders);
+        Map<String, ColumnWrapper> headerColumnWrapper = convertExcelHeaders2DBColumnWrappers(formItemMap, combinedHeaders, dataList, abandonedHeaders);
 
         // 持久化
         persist(headerColumnWrapper, dataList, currUserAgencyId, abandonedHeaders, customerItems.get(0).getTableName(), currUserAgencyPids, currentUserId);
 
-        return headerColumnWrapper;
+        return headers;
+    }
+
+    /**
+     * excel导入居民附加信息
+     * @param excelPathName
+     * @param sheetNo
+     * @param headRowNumber
+     * @param currUserAgencyId
+     * @param currUserAgencyPids
+     * @param currentUserId
+     * @return
+     */
+    private Object importIcResiExtraInfoFromExcel(String excelPathName, int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId) {
+        DynamicEasyExcelListener readListener = new DynamicEasyExcelListener();
+        EasyExcelFactory.read(new File(excelPathName)).registerReadListener(readListener).headRowNumber(headRowNumber).sheet(sheetNo).doRead();
+
+        List<Map<Integer, String>> headList = readListener.getHeadList();
+        List<Map<Integer, String>> dataList = readListener.getDataList();
+
+        Map<Integer, List<String>> headers = mergeHead(headList);
+
+        // 查询form相关信息
+        List<FormItem> customerItems = listFormItems("resi_base_info");
+
+        // 清洗表头数据
+        Map<Integer, String> abandonedHeaders = washHeaders(headers, customerItems);
+
+        //合并多级表头
+        HashMap<String, List<Integer>> combinedHeaders = combineHeaders(headers);
+
+        // 得到客户配置item数据
+        Map<String, FormItem> formItemMap = customerItems.stream().collect(
+                Collectors.toMap(formItem -> {
+                    String groupLabel = formItem.getGroupLabel();
+                    String label = formItem.getLabel();
+                    if (StringUtils.isNotBlank(groupLabel)) {
+                        return groupLabel.concat(":").concat(label);
+                    } else {
+                        return label;
+                    }
+                }, formItem -> formItem)
+        );
+        Map<String, ColumnWrapper> headerColumnWrapper = convertExcelHeaders2DBColumnWrappers(formItemMap, combinedHeaders, dataList, abandonedHeaders);
+
+        return formItemMap;
     }
 
     /**
@@ -496,11 +601,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @param currUserAgencyId 当前用户的组织id
      * @param checkBoxOptionColumnIdxAndLabel 复选框的列号&label中文
      */
-    private void persist(Map<String, ColumnWrapper> headerColumnWrapper, List<Map<Integer, String>> dataRows, 
+    private void persist(Map<String, ColumnWrapper> headerColumnWrapper, List<Map<Integer, String>> dataRows,
                          String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel, String tableName,
                          String currUserAgencyPids, String currentUserId) {
         for (Map<Integer, String> row : dataRows) {
-            
+
             // 当前行的列们
 //            List<ColumnWrapper> columnsOfCurrRow = new ArrayList<>();
 
@@ -556,7 +661,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             columnAndValues.put("IS_UNITED_FRONT", "0");
             columnAndValues.put("IS_VETERANS", "0");
             columnAndValues.put("IS_VOLUNTEER", "0");
-            
+
             columnAndValues.put("AGENCY_ID", currUserAgencyId);
             columnAndValues.put("PIDS", currUserAgencyPids);
             columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId());
@@ -569,11 +674,23 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 //            });
 
 //            System.out.println("-------------------");
-            
+
             baseDao.add(tableName, columnAndValues);
         }
     }
 
+    /**
+     * 根据formCode查询该form的item列表
+     * @param formCode
+     * @return
+     */
+    private List<FormItem> listFormItems(String formCode) {
+        CustomerFormQueryDTO form = new CustomerFormQueryDTO();
+        form.setFormCode(formCode);
+        Result<List<FormItem>> result = operCustomizeOpenFeignClient.listItems(form);
+        return getResultDataOrThrowsException(result, ServiceConstant.OPER_CUSTOMIZE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【居民信息excel导入】查询表单相关信息失败");
+    }
+
     /**
      * @description 合并头
      *
@@ -626,14 +743,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @description 数据整合
-     *
+     * @description 数据整合，将excel表头汉字信息转化成ColumnWrapper列封装数据
+     *      *      key:itemId
+     *      *      value:ColumnWrapper列包装信息
+     * @param formItemMap item map
+     *                    key:itemId;
+     *                    value: 合并之后的head字符串，例如：健康信息:监护人
+     * @param combinedHeaders 合并之后的head信息。
+     *                        key：合并之后head字符串(例如：党员信息:入党时间)；
+     *                        value：列号组成的列表(例如[1,2,3])
+     * @param datas
+     * @param abandonedHeaders
      * @return
-     * @author wxz
-     * @date 2021.10.28 17:08:51
      */
-    private Map<String, ColumnWrapper> integrate(Map<String, FormItem> formItemMap, Map<String, List<Integer>> combinedHeaders,
-                                                           List<Map<Integer, String>> datas, Map<Integer, String> abandonedHeaders) {
+    private Map<String, ColumnWrapper> convertExcelHeaders2DBColumnWrappers(Map<String, FormItem> formItemMap, Map<String, List<Integer>> combinedHeaders,
+                                                                            List<Map<Integer, String>> datas, Map<Integer, String> abandonedHeaders) {
 
 //        HashMap<String, List<ColumnWrapper>> tables = new HashMap<>();
         Map<String, ColumnWrapper> columns = new LinkedHashMap<>(combinedHeaders.size());
@@ -707,7 +831,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             cascadeItemId = uriParts[1];
 
             // 根据uri上的id，找到关联的itemid，从而找到关联的item的值
-            cascadeItemColumnWrapper = columnWrappers.get(cascadeItemId);
+            if (columnWrappers != null){
+                cascadeItemColumnWrapper = columnWrappers.get(cascadeItemId);
+            }
         } else {
             pureUri = fullUri;
         }
@@ -769,7 +895,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         }
 
-        if (options == null) return null;
+        if (options == null) {
+            return null;
+        }
 
         return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue));
 
@@ -806,6 +934,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     /**
      * @description 合并表头
+     *          Map<Integer, List<String>>
      *
      * @param headList
      * @return
@@ -813,67 +942,42 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @date 2021.10.27 16:17:34
      */
     private Map<Integer, List<String>> mergeHead(List<Map<Integer, String>> headList) {
-        Map<Integer, String> l1 = headList.get(0);
-        Map<Integer, String> l2 = headList.get(1);
-        Map<Integer, String> l3 = headList.get(2);
-
-        String l1LastHeadName = "";
-        String l2LastHeadName = "";
 
-        //Map<Integer, String> resultMap = new HashMap<>();
-        HashMap<Integer, List<String>> result = new HashMap<>();
+        Map<Integer, String> lastNotNullHeads = new LinkedHashMap<>();
 
-        for (Map.Entry<Integer, String> entry : l1.entrySet()) {
+        Map<Integer, List<String>> mergedHead = new LinkedHashMap<>();
 
-            StringBuilder headerNameConcatStr = new StringBuilder();
+        int levelCount = headList.size();
 
-            Integer key = entry.getKey();
-            String l1TempValue = entry.getValue();
+        Map<Integer, String> firstLevel = headList.get(0);
 
-            String l2TempValue = l2.get(key);
-            String l3TempValue = l3.get(key);
+        // 遍历所有列
+        for (Map.Entry<Integer, String> column : firstLevel.entrySet()) {
+            Integer columIndex = column.getKey();
 
-            if (StringUtils.isNotBlank(l1TempValue)) {
-                l1LastHeadName = l1TempValue;
-            }
-
-            if (StringUtils.isNotBlank(l2TempValue)) {
-                l2LastHeadName = l2TempValue;
-            }
+            List<String> labels = new ArrayList<>();
 
-            // 开始拼接
-            if (StringUtils.isNotBlank(l3TempValue)) {
-                //headerNameConcatStr.append(l1LastHeadName).append(":").append(l2LastHeadName).append(":").append(l3TempValue);
-                //resultMap.put(key, headerNameConcatStr.toString());
-                ArrayList<String> parts = new ArrayList<>();
-                parts.add(l1LastHeadName);
-                parts.add(l2LastHeadName);
-                parts.add(l3TempValue);
-                result.put(key, parts);
-                continue;
-            }
+            // 竖着遍历该列的所有行
+            for (int currentLevel = 0; currentLevel < levelCount; currentLevel ++) {
+                String label = headList.get(currentLevel).get(columIndex);
 
-            if (StringUtils.isNotBlank(l2TempValue)) {
-                //headerNameConcatStr.append(l1LastHeadName).append(":").append(l2LastHeadName);
-                //resultMap.put(key, headerNameConcatStr.toString());
-                ArrayList<String> parts = new ArrayList<>();
-                parts.add(l1LastHeadName);
-                parts.add(l2LastHeadName);
-                result.put(key, parts);
-                continue;
-            }
+                if (StringUtils.isNotBlank(label)) {
+                    lastNotNullHeads.put(currentLevel, label);
+                } else {
+                    if (currentLevel == 0 || StringUtils.isBlank(headList.get(currentLevel - 1).get(columIndex))) {
+                        label = lastNotNullHeads.get(currentLevel);
+                    }
+                }
 
-            if (StringUtils.isNotBlank(l1TempValue)) {
-                //headerNameConcatStr.append(l1LastHeadName);
-                //resultMap.put(key, headerNameConcatStr.toString());
-                ArrayList<String> parts = new ArrayList<>();
-                parts.add(l1LastHeadName);
-                result.put(key, parts);
-                continue;
+                if (StringUtils.isNotBlank(label)) {
+                    labels.add(label);
+                }
             }
 
+            mergedHead.put(columIndex, labels);
         }
-        return result;
+
+        return mergedHead;
     }
 
     /**
@@ -942,9 +1046,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      */
     @Override
     public PersonDataResultDTO personData(PersonDataFormDTO formDTO) {
-        baseDao.personData(formDTO.getUserId());
+        PersonDataResultDTO personData = baseDao.personData(formDTO.getUserId());
+        if (null == personData){
+            return new PersonDataResultDTO();
+        }
+        // 房屋信息查询
+        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard());
+        if (!listResult.success()){
+            throw new RenException("查询房屋信息失败");
+        }
+        personData.setHouseInfo(listResult.getData());
         // TODO
-        return null;
+        return personData;
     }
 
     /**
@@ -986,28 +1099,53 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Override
     public Map<String, Map<String, Object>> getDataForExport(Map<String, FormItem> formItemMap, String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions) {
         List<Map<String, Object>> mapList = this.dynamicQuery(customerId, formCode, baseTableName, conditions);
-
+        System.out.println("======remote:"+baseTableName+"   "+JSON.toJSONString(formItemMap));
         Map<String, Map<String, Object>> result = new LinkedHashMap<>();
         mapList.stream().filter(Objects::nonNull).forEach(map -> {
             String resiId = (String) map.getOrDefault(UserConstant.IC_RESI_USER, "");
-            formItemMap.forEach((k, v)->{
+            for (Map.Entry<String, FormItem> e : formItemMap.entrySet()) {
+                String k = e.getKey();
+                FormItem v = e.getValue();
                 Object temp = map.get(k);
                 if (temp != null) {
                     if (v.getOptionSourceType().equals("remote")) {
-                        //todo 获取 options
-                    }
-                    if (v.getItemType().equals("checkbox")) {
-                        v.getOptions().forEach(optionDTO -> {
-                            map.put(optionDTO.getValue(), temp.toString().contains(optionDTO.getValue()) ? "是" : "否");
-                        });
-                    } else if (v.getItemType().equals("select")) {
-                        v.getOptions().forEach(optionDTO -> {
-                            map.put(optionDTO.getValue(), temp.toString().equals(optionDTO.getValue()) ? optionDTO.getLabel() : "");
-                        });
+                        try {
+                            //todo 获取 options
+                            Map<String, String> stringMap = listRemoteOptions(new HashMap<>(), v.getOptionSourceValue(), null);
+                            if ("checkbox".equals(v.getItemType())) {
+                                stringMap.forEach((label, value) -> map.put(value, temp.toString().contains(value) ? "是" : "否"));
+                            } else if ("select".equals(v.getItemType())) {
+                                stringMap.forEach((label,value)->{
+                                    if (temp.toString().equals(value)){
+                                        map.put(k, label);
+                                    }
+                                });
+                            }
+                        } catch (Exception ex) {
+                            log.warn("listRemoteOptions url:{}",v.getOptionSourceValue());
+                        }
 
+                    } else {
+                        if ("checkbox".equals(v.getItemType())) {
+                            v.getOptions().forEach(optionDTO -> {
+                                map.put(optionDTO.getValue(), temp.toString().contains(optionDTO.getValue()) ? "是" : "否");
+                            });
+                        } else if ("select".equals(v.getItemType())) {
+                            v.getOptions().forEach(optionDTO -> {
+                                if (optionDTO.getValue().equals(temp.toString())){
+                                    map.put(k, optionDTO.getLabel());
+                                }
+                            });
+                        } else if ("radio".equals(v.getItemType())) {
+                            v.getOptions().forEach(optionDTO -> {
+                                if (optionDTO.getValue().equals(temp.toString())){
+                                    map.put(k, optionDTO.getLabel());
+                                }
+                            });
+                        }
                     }
                 }
-            });
+            }
             if ("ic_resi_user".equals(baseTableName)) {
                 resiId = (String) map.get("ID");
             }
@@ -1038,9 +1176,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     map.put("VILLAGE_NAME", houseInfoDTO.getNeighborHoodName());
                     map.put("BUILD_NAME", houseInfoDTO.getBuildingName());
                     map.put("HOME_ID", houseInfoDTO.getDoorName());
+                    map.put("UNIT_ID", houseInfoDTO.getUnitName());
                 }
             }
-
         });
         return result;
     }

epmet-user/epmet-user-server/src/main/resources/logback-spring.xml

@@ -139,7 +139,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>

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

@@ -44,8 +44,36 @@
         select * from ${subTableName} where del_flag='0' and IC_RESI_USER=#{icResiUserId} and customer_id=#{customerId}
     </select>
 
+    <!-- 列表查询 -->
+    <sql id="listWhereForPage">
+        ic_resi_user.DEL_FLAG = '0'
+        and ic_resi_user.customer_id=#{customerId}
+        and (ic_resi_user.AGENCY_ID =#{currentStaffAgencyId} or ic_resi_user.pids like concat(#{staffOrgPath},'%'))
+        <if test="null != conditions and conditions.size() > 0">
+            <foreach item="subCondition" collection="conditions" open="" separator="" close="">
+                <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        </if>
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        </if>
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
+                        and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
+                    </if>
+                </if>
+            </foreach>
+        </if>
+    </sql>
 
-    <!-- 公用where条件   -->
+    <!-- 导出公用where条件   -->
     <sql id="listWhere">
         ic_resi_user.DEL_FLAG = '0'
         and ic_resi_user.customer_id=#{customerId}
@@ -54,11 +82,15 @@
                 <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
@@ -73,12 +105,10 @@
     <select id="selectListResiMap" parameterType="map" resultType="map">
         select
         ic_resi_user.id as icResiUserId,
+        ic_resi_user.AGENCY_ID as  ORG_ID,
         <foreach item="column" collection="resultColumns" open="" separator="," close="">
             ${column.columnName}
         </foreach>
-        ,
-        GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE) as DEMAND_CATEGORY_IDS,
-        GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME) as DEMAND_NAME
         FROM
         ic_resi_user
         <if test="null != subTables and subTables.size() > 0">
@@ -86,12 +116,8 @@
                 ${subTableName}
             </foreach>
         </if>
-
-        left join ic_resi_demand_dict
-        on(ic_resi_user.customer_id=ic_resi_demand_dict.CUSTOMER_ID
-        and ic_resi_demand.CATEGORY_CODE=ic_resi_demand_dict.CATEGORY_CODE )
         <where>
-            <include refid="listWhere"></include>
+            <include refid="listWhereForPage"></include>
         </where>
         group by IC_RESI_USER.id
         order by ic_resi_user.CREATED_TIME desc
@@ -160,4 +186,32 @@
           AND `NAME` LIKE CONCAT('%',#{name},'%')
         ORDER BY `NAME`
     </select>
+
+    <select id="selectUserDemandCode" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT DISTINCT
+            m.CATEGORY_CODE
+        FROM
+            ic_resi_demand m
+        WHERE
+            m.DEL_FLAG = '0'
+          AND m.IC_RESI_USER = #{icResiUserId}
+        ORDER BY
+            m.CREATED_TIME ASC
+    </select>
+
+    <select id="selectCategoryNames" parameterType="map" resultType="java.lang.String">
+        SELECT
+            GROUP_CONCAT(m.CATEGORY_NAME)
+        FROM
+            ic_resi_demand_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+          AND m.CUSTOMER_ID = #{customerId}
+        <if test="null != codeSet and codeSet.size() > 0">
+            AND m.CATEGORY_CODE IN
+            <foreach item="code" collection="codeSet" open="(" separator="," close=")">
+                #{code}
+            </foreach>
+        </if>
+    </select>
 </mapper>