网格类型字典

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -21,6 +21,7 @@ public enum DictTypeEnum {
     USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10),
     AGE_GROUP("age_group", "年龄范围", 11),
     PATROL_WORK_TYPE("patrol_work_type", "例行工作分类", 13),
+    GRID_TYPE("grid_type", "网格类型", 12),
     ;
 
     private final String code;

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

@@ -222,7 +222,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         Result<List<StaffGridListDTO>> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS);
         griddetail.setStaffGridList(staffGridList.getData());
         //查询网格类型字典表数据
-        Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode());
+        Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.GRID_TYPE.getCode());
         Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
         if (StringUtils.isNotBlank(griddetail.getGridType())) {
             griddetail.setGridTypeName(statusMap.get(griddetail.getGridType()));
@@ -374,7 +374,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
 
         //2.查询网格类型字典表数据
-        Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode());
+        Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.GRID_TYPE.getCode());
         Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
 
         //3.封装数据并返回