From f0d625c9af19c556c5d2e70967dbd3b3093608dc Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 22 六月 2021 17:04:01 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 f4ceba7..9056f56 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
@@ -244,6 +244,7 @@
",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 1) as localTotal " +
",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
+ ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
" from com_mng_population as cmp where act_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
@@ -736,6 +737,17 @@
" community_id = #{communityId}")
List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
+ @Select("SELECT " +
+ " count( id ) AS peopleNum, " +
+ " ( SELECT count( id ) FROM com_mng_population_house AS cmph WHERE village_id = #{villageId} ) AS houseNum, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 1 ) AS registerNum, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 2 ) AS flowNum " +
+ "FROM " +
+ " com_mng_population AS cmp " +
+ "WHERE " +
+ " village_id = #{villageId}")
+ CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);
+
@Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
Map<String, Long> countBySex(@Param("communityId") Long communityId);
@@ -809,15 +821,18 @@
@Select("SELECT " +
" su.nick_name AS userName, " +
" su.image_url AS imageUrl, " +
- " e.happen_time as createAt, " +
+ " e.create_at as createAt, " +
" e.event_des, " +
+ " e.event_clazz, " +
" e.danger_level, " +
" e.urgent, " +
" e.major, " +
" e.happen_address, " +
" e.happent_lat_lng, " +
" e.event_type, " +
+ " e.event_category, " +
" e.id, " +
+ " egd.grid_name, " +
" e.event_deal_status " +
"FROM " +
" `event` AS e " +
@@ -827,4 +842,10 @@
" e.id = #{eventId}")
EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);
+ @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}")
+ List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);
+
+ @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
+ Integer getStatisticsCount(@Param("communityId") Long communityId);
+
}
--
Gitblit v1.7.1