From f0dcdcea46ed4981e33f662a7944ef68c02bad30 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期二, 23 四月 2024 10:25:34 +0800
Subject: [PATCH] 双报到双服务 问题清单

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
index c06e8bb..bee7acf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -10,12 +10,14 @@
 import javax.annotation.Resource;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.panzhihua.common.model.dtos.community.building.BuildingDto;
 import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail;
 import com.panzhihua.common.model.dtos.community.large.AreaStreetDetailResp;
 import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
+import com.panzhihua.common.model.dtos.partybuilding.QryReportResp;
 import com.panzhihua.common.model.vos.StreetVO;
 import com.panzhihua.common.model.vos.area.StreetAndBuildVO;
 import com.panzhihua.common.model.vos.community.bigscreen.ScreenStatics;
@@ -396,12 +398,21 @@
         List<Long> ids = doList.stream().map(ComActDO::getCommunityId).collect(Collectors.toList());
 
         AreaStreetDetail result = new AreaStreetDetail();
-        //查询 街道相关信息
-        AreaStreetDetailResp village = comActDAO.selectVillage(ids,type);
-        result.setAreaStreetDetailResp(village);
-        //查询 人口相关数据
-        EventPopulationSpecialStatisticsVO eventResult = comActDAO.selectEvent(ids);
-        result.setEventPopulationVO(eventResult);
+        if(CollectionUtil.isNotEmpty(ids)){
+            //查询 街道相关信息
+            AreaStreetDetailResp village = comActDAO.selectVillage(ids,type);
+            result.setAreaStreetDetailResp(village);
+            //查询 人口相关数据
+            EventPopulationSpecialStatisticsVO eventResult = comActDAO.selectEvent(ids);
+            result.setEventPopulationVO(eventResult);
+        }
+        return result;
+    }
+
+
+    @Override
+    public List<QryReportResp> qryReport(String yearTime) {
+        List<QryReportResp> result = comActDAO.qryReport(yearTime);
         return result;
     }
 }

--
Gitblit v1.7.1