Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize

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

@@ -297,32 +297,6 @@ public class BuildingServiceImpl implements BuildingService {
             return result;
         }
         result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList()));
-        List<BuildingTreeLevelDTO> gridList = customerGridList.stream().map(item -> {
-            BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
-            buildingTreeLevelDTO.setId(item.getId());
-            buildingTreeLevelDTO.setLabel(item.getGridName());
-            buildingTreeLevelDTO.setLevel("grid");
-            buildingTreeLevelDTO.setPId(item.getPid());
-            buildingTreeLevelDTO.setLongitude(item.getLongitude());
-            buildingTreeLevelDTO.setLatitude(item.getLatitude());
-            buildingTreeLevelDTO.setChildren(new ArrayList<>());
-            //当前网格下有几个小区
-            buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR);
-            return buildingTreeLevelDTO;
-        }).collect(Collectors.toList());
-
-
-        //3.获取网格下的所有小区
-        List<String> gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
-        LambdaQueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<IcNeighborHoodEntity>().lambda()
-                .in(IcNeighborHoodEntity::getGridId, gridIdList)
-                .orderByAsc(IcNeighborHoodEntity::getCreatedTime);
-        List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper);
-        if(CollectionUtils.isEmpty(icNeighborHoodList)){
-            agencyList.addAll(gridList);
-            return result;
-        }
-        result.addAll(icNeighborHoodList.stream().map(m -> m.getId()).collect(Collectors.toList()));
         return result;
     }
 

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

@@ -24,6 +24,7 @@
             a.`NAME`,
             a.MOBILE,
             a.ID_CARD,
+            a.reason,
             a.REMARK,
             IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime,
             IFNULL(v.vaccinationCount,0) AS vaccinationCount