From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 6 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 f361a49..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);
@@ -305,11 +306,76 @@
@Select("SELECT " +
" count( e.id ) AS eventTFTotal, " +
- " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND grid_id = egd.id ),0) AS eventZATotal, " +
- " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND grid_id = egd.id ),0) AS eventMDTotal, " +
- " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND grid_id = egd.id ),0) AS eventTSTotal, " +
- " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 4 AND event_status = 2 AND grid_id = egd.id ),0) AS eventBWDTotal, " +
- " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND grid_id = egd.id ),0) AS eventGGTotal " +
+ " IFNULL(( " +
+ " SELECT " +
+ " count( e1.id ) " +
+ " FROM " +
+ " `event` AS e1 " +
+ " LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id " +
+ " WHERE " +
+ " event_category = 1 " +
+ " AND event_type = 1 " +
+ " AND event_status = 2 " +
+ " AND egd1.grid_community_id = #{communityId} " +
+ " ), " +
+ " 0 " +
+ " ) AS eventZATotal, " +
+ " IFNULL(( " +
+ " SELECT " +
+ " count( e2.id ) " +
+ " FROM " +
+ " `event` AS e2 " +
+ " LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id " +
+ " WHERE " +
+ " event_category = 1 " +
+ " AND event_type = 3 " +
+ " AND event_status = 2 " +
+ " AND egd2.grid_community_id = #{communityId} " +
+ " ), " +
+ " 0 " +
+ " ) AS eventMDTotal, " +
+ " IFNULL(( " +
+ " SELECT " +
+ " count( e3.id ) " +
+ " FROM " +
+ " `event` AS e3 " +
+ " LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id " +
+ " WHERE " +
+ " event_category = 1 " +
+ " AND event_type = 6 " +
+ " AND event_status = 2 " +
+ " AND egd3.grid_community_id = #{communityId} " +
+ " ), " +
+ " 0 " +
+ " ) AS eventTSTotal, " +
+ " IFNULL(( " +
+ " SELECT " +
+ " count( e4.id ) " +
+ " FROM " +
+ " `event` AS e4 " +
+ " LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " +
+ " WHERE " +
+ " event_category = 1 " +
+ " AND event_type = 4 " +
+ " AND event_status = 2 " +
+ " AND egd4.grid_community_id = #{communityId} " +
+ " ), " +
+ " 0 " +
+ " ) AS eventBWDTotal, " +
+ " IFNULL(( " +
+ " SELECT " +
+ " count( e5.id ) " +
+ " FROM " +
+ " `event` AS e5 " +
+ " LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " +
+ " WHERE " +
+ " event_category = 1 " +
+ " AND event_type = 2 " +
+ " AND event_status = 2 " +
+ " AND egd5.grid_community_id = #{communityId} " +
+ " ), " +
+ " 0 " +
+ " ) AS eventGGTotal " +
"FROM " +
" `event` AS e " +
" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
@@ -623,6 +689,7 @@
@Select("SELECT " +
" event_type AS type, " +
+ " e.id AS eventId, " +
" happent_lat_lng AS latLng " +
"FROM " +
" `event` AS e " +
@@ -636,6 +703,7 @@
" AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH ) UNION ALL " +
"SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
+ " id AS eventId, " +
" lng_lat AS latLng " +
"FROM " +
" com_act_easy_photo " +
@@ -668,6 +736,17 @@
"WHERE " +
" 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}")
@@ -742,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 " +
@@ -760,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