From d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 14 十二月 2021 16:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index e5722ec..da688d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
import org.apache.ibatis.annotations.Insert;
@@ -366,7 +367,7 @@
CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,
@Param("lastMonth") Date lastMonth);
- @Select("SELECT `NAME`, " + " user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id " + "FROM "
+ @Select("SELECT `NAME`, " + "user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id " + "FROM "
+ " com_mng_village AS cmv " + "WHERE " + " community_id = #{communityId}")
List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
@@ -615,6 +616,14 @@
*/
void updatePopulationUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);
+ /**
+ * 根据villageId查询特殊人群数
+ * @param villageId
+ * @param label
+ * @return
+ */
+ Integer selectCountByVillageId(@Param("villageId") Long villageId,@Param("label")String label);
+
CivilPartyStatisticsVO getCivilParty(@Param("communityId") Long communityId);
CivilGovernmentStatisticsVO getCivilGovernment(@Param("communityId") Long communityId);
@@ -622,4 +631,20 @@
CivilGridStatisticsVO getCivilGrid(@Param("communityId") Long communityId);
CivilConvenienceStatisticsVO getCivilConvenience(@Param("communityId") Long communityId);
+
+ /**
+ * 西区治理数据统计
+ * @return
+ */
+ WestScreenStatics westScreenStatics();
+
+ List<EventPopulationBasicsStatisticsVO> getBasicsList(@Param("streetId") Long streetId);
+
+ EventPopulationSpecialStatisticsVO getPopulationSpecial(@Param("streetId") Long streetId);
+
+ List<String> getPopulationListCardNo(@Param("streetId") Long streetId);
+
+ Integer getPopulationAge(@Param("streetId") Long streetId);
+
+ List<EventPopulationStreetVO> getComprehensiveStreetList();
}
--
Gitblit v1.7.1