综合治理图层查询2

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql

@@ -1 +1,8 @@
 ALTER TABLE ic_form_item ADD COLUMN ZHZL_LIST_DISPLAY TINYINT ( 1 ) DEFAULT '0' COMMENT '综合治理图层列表显示：1展示，0不展示' AFTER LIST_DISPLAY;
+
+
+update ic_form_item i set i.ZHZL_LIST_DISPLAY='1'
+where i.DEL_FLAG='0'
+  and i.COLUMN_NAME in(
+                       'GRID_ID','HOME_ID','NAME','MOBILE','ID_CARD','GENDER','BIRTHDAY','REMARKS','IS_XFRY','IS_SPECIAL','SPECIAL_RQLB'
+    );

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

@@ -3213,9 +3213,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     resultMap.put(UserConstant.GENDER, GenderEnum.UN_KNOWN.getName());
                 }
             }
+            List<String> zhzlCategoryName=new ArrayList<>();
             // 如果是信访人员
-
+            String isXfry = StringUtils.isNotBlank((String)resultMap.get("IS_XFRY")) ? resultMap.get("IS_XFRY").toString() : StrConstant.EPMETY_STR;
+            if(NumConstant.ONE_STR.equals(isXfry)){
+                zhzlCategoryName.add("信访人员");
+            }
             // 如果是特殊人群，且有特殊人群类别
+            String isSpecial = StringUtils.isNotBlank((String)resultMap.get("IS_SPECIAL")) ? resultMap.get("IS_SPECIAL").toString() : StrConstant.EPMETY_STR;
+            String specialRqlb = StringUtils.isNotBlank((String)resultMap.get("SPECIAL_RQLB")) ? resultMap.get("SPECIAL_RQLB").toString() : StrConstant.EPMETY_STR;
+            if(NumConstant.ONE_STR.equals(isSpecial)&&StringUtils.isNotBlank(specialRqlb)){
+                String[] att=specialRqlb.split(StrConstant.COMMA);
+                for(String categoryCode:att){
+                    zhzlCategoryName.add(ZhzlResiCategoryEnum.getEnum(categoryCode).getName());
+                }
+            }
+            resultMap.put("zhzlCategoryName",zhzlCategoryName.stream().collect(Collectors.joining(StrConstant.COMMA)));
         }
         pageInfo.setList(list);
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());