From dbf73179780c248e0c9cbf2ae76ca836bd234c93 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 25 六月 2021 10:10:41 +0800
Subject: [PATCH] 根据网格员id查询网格新增社区id字段

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 9aeb363..bfc4191 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -162,6 +162,7 @@
             EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
             if (eventGridDataDO != null) {
                 eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+                eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId());
             }
 
             //查询事件关联附件
@@ -2184,6 +2185,11 @@
     @Override
     public R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO) {
         IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(), specialPopulationDTO.getPageSize()), specialPopulationDTO);
+        if(!specialPopulationVOIPage.getRecords().isEmpty()){
+            specialPopulationVOIPage.getRecords().forEach(specialPopulation -> {
+                specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard()));
+            });
+        }
         return R.ok(specialPopulationVOIPage);
     }
         

--
Gitblit v1.7.1