去掉经济低保字段

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

@@ -329,34 +329,24 @@ 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,List<OptionDTO>> checkListMap = new HashMap<>();
-        for (FormItem item : resiFormItems.getItemList()) {
-
-            if ("checkbox".equals(item.getItemType())) {
-                List<OptionDTO> options = null;
-                if ("remote".equals(item.getOptionSourceType())) {
-
-                } else if ("local".equals(item.getOptionSourceType())) {
-                    options = item.getOptions();
-                }
-                checkListMap.put(item.getColumnName().concat(item.getColumnNum().equals(0) ? "" : item.getColumnNum().toString()), options);
-            }
-        }*/
 
-        //PageData<Map<String, Object>> mapPageData = icResiUserService.pageResiMap(pageFormDTO);
-        //List<Map<String, Object>> resiMainList = mapPageData.getList();
         Map<String, FormItem> itemMap = new HashMap<>();
         for (FormItem formItem : resiFormItems.getItemList()) {
             if (StringUtils.isNotBlank(formItem.getColumnName())){
+                continue;
+            }
+            if  (formItem.getItemType().equals("checkbox") || formItem.getItemType().equals("select")){
                 itemMap.put(formItem.getColumnName().concat(formItem.getColumnNum() == 0 ? "" : formItem.getColumnNum().toString()), formItem);
             }
             if (formItem.getChildGroup() != null) {
                 for (FormItem2 item2 : formItem.getChildGroup().getItemList()) {
-                    if (item2.getItemType().equals("checkbox")) {
+                    if (StringUtils.isNotBlank(item2.getColumnName())){
+                        continue;
+                    }
+                    if  (item2.getItemType().equals("checkbox") || item2.getItemType().equals("select")){
                         itemMap.put(item2.getColumnName().concat(item2.getColumnNum() == 0 ? "" : item2.getColumnNum().toString()), ConvertUtils.sourceToTarget(item2,FormItem.class));
                     }
                 }
@@ -366,14 +356,16 @@ public class IcResiUserController {
         for (FormGroupDTO groupItem : resiFormItems.getGroupList()) {
             if (groupItem.getItemList() != null) {
                 for (FormItem2 item : groupItem.getItemList()) {
-                    if (StringUtils.isBlank(item.getColumnName())){
+                    if (StringUtils.isNotBlank(item.getColumnName())){
                         continue;
                     }
-                    System.out.println(item.getColumnName()+item.getColumnNum());
+                    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));
                     }
                 }
             }
+        }
+        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());
         //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));

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

@@ -963,9 +963,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     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() : "");
+                        });
+
+                    }
                 }
             });
             if ("ic_resi_user".equals(baseTableName)) {