加了个网格

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

@@ -73,6 +73,8 @@ public class VaccinationListResultDTO implements Serializable {
      * 所属楼宇Id
      */
     private String buildId;
+    private String gridId;
+    private String gridName;
 
     /**
      * 所属楼宇名称

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

@@ -15,6 +15,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelPoiUtils;
@@ -170,6 +171,15 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                 result.setList(list);
                 result.setTotal(list.size());
             }
+            if (CollectionUtils.isNotEmpty(result.getList())){
+                result.getList().forEach(r -> {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId());
+                    if (null == gridInfo){
+                        throw new EpmetException("查询网格失败："+r.getGridId());
+                    }
+                    r.setGridName(gridInfo.getGridNamePath());
+                });
+            }
         }
         if (CollectionUtils.isNotEmpty(result.getList())){
             result.getList().forEach(v -> {

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

@@ -97,6 +97,7 @@
         b.UNIT_ID,
         b.HOME_ID,
         b.id as userId,
+        b.grid_id as gridId,
         a.ISOLATED_STATE,
         IFNULL((SELECT DATE_FORMAT(NAT_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_nat WHERE DEL_FLAG = '0' AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastNatTime
         FROM ic_epidemic_special_attention a