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 |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 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 2938354..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,8 @@
 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;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,8 +27,6 @@
 import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
 import com.panzhihua.common.model.vos.area.AreaAddressVO;
-import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
-import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
 import com.panzhihua.common.model.vos.community.screen.event.*;
 import com.panzhihua.common.model.vos.community.screen.index.*;
 import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -349,7 +349,7 @@
         + " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " + " </if> "
         + "<if test='screenEventDTO.redCard != null'>" + " AND e.red_card = #{screenEventDTO.redCard} " + " </if> "
         + "<if test='screenEventDTO.yellowCard != null'>" + " AND e.yellow_card = #{screenEventDTO.yellowCard} "
-        + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt,  "
+        + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt  "
         + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = #{screenEventDTO.communityId}  "
         + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
         + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
@@ -367,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,4 +615,36 @@
      * @param newUnitNo 新单元号
      */
     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);
+
+    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