From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 186 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 30 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 6129e4a..fa5f114 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
@@ -434,7 +435,8 @@
" label like concat('%',#{label},'%')")
Integer getSpecialStatisticsByLabel(@Param("label") String label);
- @Select("SELECT " +
+ @Select("<script> " +
+ "SELECT " +
" count( egd.id ) AS gridTotal, " +
" ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
" ( " +
@@ -446,6 +448,12 @@
" WHERE " +
" egd1.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ) AS eventTotal, " +
" ( " +
" SELECT " +
@@ -456,6 +464,12 @@
" WHERE " +
" egd2.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
" ( " +
" SELECT " +
@@ -467,12 +481,19 @@
" egd2.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ) AS solveEventTotal " +
"FROM " +
" event_grid_data AS egd " +
"WHERE " +
- " egd.grid_community_id = #{communityId}")
- EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);
+ " egd.grid_community_id = #{screenEventDTO.communityId} " +
+ " </script>")
+ EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
@Select("SELECT " +
" DATE_FORMAT( e.create_at, '%m' ) months " +
@@ -490,7 +511,8 @@
" LIMIT 3")
List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
- @Select("SELECT " +
+ @Select("<script> " +
+ "SELECT " +
" count( e.id ) AS eventZATotal, " +
" IFNULL(( " +
" SELECT " +
@@ -499,10 +521,16 @@
" `event` AS e1 " +
" LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id " +
" WHERE " +
- " egd1.grid_community_id = #{communityId} " +
+ " egd1.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 1 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS yesEventZATotal, " +
@@ -513,10 +541,16 @@
" `event` AS e2 " +
" LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id " +
" WHERE " +
- " egd2.grid_community_id = #{communityId} " +
+ " egd2.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 5 " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS eventTFTotal, " +
@@ -527,10 +561,16 @@
" `event` AS e3 " +
" LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id " +
" WHERE " +
- " egd3.grid_community_id = #{communityId} " +
+ " egd3.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 5 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS yesEventTFTotal, " +
@@ -541,10 +581,16 @@
" `event` AS e4 " +
" LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " +
" WHERE " +
- " egd4.grid_community_id = #{communityId} " +
+ " egd4.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 6 " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS eventTSTotal, " +
@@ -555,10 +601,16 @@
" `event` AS e5 " +
" LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " +
" WHERE " +
- " egd5.grid_community_id = #{communityId} " +
+ " egd5.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 6 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS yesEventTSTotal, " +
@@ -569,10 +621,16 @@
" `event` AS e6 " +
" LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id " +
" WHERE " +
- " egd6.grid_community_id = #{communityId} " +
+ " egd6.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 3 " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS eventMDTotal, " +
@@ -583,10 +641,16 @@
" `event` AS e7 " +
" LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id " +
" WHERE " +
- " egd7.grid_community_id = #{communityId} " +
+ " egd7.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 3 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS yesEventMDTotal, " +
@@ -597,10 +661,16 @@
" `event` AS e8 " +
" LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id " +
" WHERE " +
- " egd8.grid_community_id = #{communityId} " +
+ " egd8.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 4 " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS eventBWDTotal, " +
@@ -611,10 +681,16 @@
" `event` AS e9 " +
" LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id " +
" WHERE " +
- " egd9.grid_community_id = #{communityId} " +
+ " egd9.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 4 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS yesEventBWDTotal, " +
@@ -625,10 +701,16 @@
" `event` AS e10 " +
" LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id " +
" WHERE " +
- " egd10.grid_community_id = #{communityId} " +
+ " egd10.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 2 " +
" AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS eventGGTotal, " +
@@ -639,24 +721,51 @@
" `event` AS e11 " +
" LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id " +
" WHERE " +
- " egd11.grid_community_id = #{communityId} " +
+ " egd11.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 2 " +
" AND event_deal_status = 4 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
" ), " +
" 0 " +
" ) AS yesEventGGTotal, " +
- " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{communityId} ), 0 ) AS eventSSPTotal, " +
- " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{communityId} ), 0 ) AS yesEventSSPTotal " +
+ " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{screenEventDTO.communityId} " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
+ "), 0 ) AS eventSSPTotal, " +
+ " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{screenEventDTO.communityId} " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
+ "), 0 ) AS yesEventSSPTotal " +
"FROM " +
" `event` AS e " +
" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
"WHERE " +
- " egd.grid_community_id = #{communityId} " +
+ " egd.grid_community_id = #{screenEventDTO.communityId} " +
" AND event_category = 1 " +
" AND event_type = 1 " +
- " AND event_status = 2")
- EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);
+ " AND event_status = 2 " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
+ " </script>")
+ EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
@Select("SELECT " +
" su.nick_name AS userName, " +
@@ -698,7 +807,8 @@
" egd.grid_community_id = #{communityId}")
List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);
- @Select("SELECT " +
+ @Select("<script> " +
+ "SELECT " +
" event_type AS type, " +
" e.id AS eventId, " +
" happent_lat_lng AS latLng " +
@@ -709,22 +819,31 @@
" e.event_category = 1 " +
" AND e.event_type IN ( 1, 2, 3, 4, 5, 6 ) " +
" AND e.event_status = 2 " +
- " AND egd.grid_community_id = #{communityId} " +
- " AND e.happen_time BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ) " +
- " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH ) UNION ALL " +
- "SELECT " +
+ " AND egd.grid_community_id = #{screenEventDTO.communityId} " +
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
+ "UNION ALL SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
" id AS eventId, " +
" lng_lat AS latLng " +
"FROM " +
" com_act_easy_photo " +
"WHERE " +
- " community_id = #{communityId} " +
+ " community_id = #{screenEventDTO.communityId} " +
" AND del_tag = 0 " +
" AND lng_lat IS NOT NULL " +
- " AND create_at BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ) " +
- " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH )")
- List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long communityId);
+ "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
+ " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+ " </if> " +
+ "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
+ " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+ " </if> " +
+ " </script>")
+ List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
@Select("SELECT " +
" count( id ) AS specialTotal, " +
@@ -876,7 +995,8 @@
Integer getStatisticsCount(@Param("communityId") Long communityId);
@Select("<script> " +
- "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmp.sex from com_mng_population as cmp " +
+ "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat" +
+ ",cmp.sex from com_mng_population as cmp left join com_mng_village as cmv on cmv.village_id = cmp.village_id " +
" where cmp.act_id = #{populationListDTO.communityId}" +
"<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != ""'>" +
"AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%')) " +
@@ -994,6 +1114,12 @@
"<if test='populationDTO.keyWord != null'>" +
" AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
" </if> " +
+ "<if test='populationDTO.populationIds != null and populationDTO.populationIds.size > 0'>" +
+ " AND cmp.id not in " +
+ "<foreach collection='populationDTO.populationIds' item='id' index='index' open='(' close=')' separator=',' >" +
+ "#{id}" +
+ "</foreach>" +
+ " </if> " +
" </script>")
IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);
--
Gitblit v1.7.1