From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 195 +++++++++++-------------------------------------
1 files changed, 44 insertions(+), 151 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 fa5f114..f6c61ca 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,7 +4,6 @@
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;
@@ -132,7 +131,6 @@
"cmp.act_id, " +
"cmp.village_id, " +
"cmp.sex, " +
- "cmp.age, " +
"cmp.card_no, " +
"cmp.road, " +
"cmp.door_no, " +
@@ -148,7 +146,6 @@
"cmp.native_place, " +
"cmp.nation, " +
"cmp.label, " +
- "cmp.relation, " +
"cmp.marriage, " +
"cmp.culture_level, " +
"cmp.out_or_local, " +
@@ -156,6 +153,7 @@
"cmp.healthy, " +
"cmp.birthday, " +
"cmp.update_at, " +
+ "cmp.address, " +
"cmp.is_rent " +
"FROM " +
"com_mng_population AS cmp " +
@@ -163,6 +161,9 @@
"<where>" +
"<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != ""'>" +
"AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
+ " </if> " +
+ "<if test='comMngPopulationVO.label != null and comMngPopulationVO.label != ""'>" +
+ "AND cmp.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
" </if> " +
"<if test='comMngPopulationVO.actId != null'>" +
" and cmp.act_id = #{comMngPopulationVO.actId} " +
@@ -215,6 +216,9 @@
"<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != ""'>" +
"AND cmp.remark = #{comMngPopulationVO.remark} " +
" </if> " +
+ "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != ""'>" +
+ "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%') " +
+ " </if> " +
" </where>" +
" order by cmp.create_at desc" +
"</script>")
@@ -235,6 +239,15 @@
" order by cmp.create_at desc " +
"</script>")
IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
+
+ @Select("<script> " +
+ "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag where community_id = #{comMngUserTagDTO.communityId}" +
+ "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != ""'>" +
+ " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " +
+ " </if> " +
+ " order by create_at desc " +
+ "</script>")
+ IPage<ComMngTagVO> specialInputUserTags(Page page, @Param("comMngUserTagDTO") PageInputUserDTO comMngUserTagDTO);
@Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}")
UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard);
@@ -435,8 +448,7 @@
" label like concat('%',#{label},'%')")
Integer getSpecialStatisticsByLabel(@Param("label") String label);
- @Select("<script> " +
- "SELECT " +
+ @Select("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, " +
" ( " +
@@ -448,12 +460,6 @@
" 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 " +
@@ -464,12 +470,6 @@
" 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 " +
@@ -481,19 +481,12 @@
" 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 = #{screenEventDTO.communityId} " +
- " </script>")
- EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+ " egd.grid_community_id = #{communityId}")
+ EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);
@Select("SELECT " +
" DATE_FORMAT( e.create_at, '%m' ) months " +
@@ -511,8 +504,7 @@
" LIMIT 3")
List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
- @Select("<script> " +
- "SELECT " +
+ @Select("SELECT " +
" count( e.id ) AS eventZATotal, " +
" IFNULL(( " +
" SELECT " +
@@ -521,16 +513,10 @@
" `event` AS e1 " +
" LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id " +
" WHERE " +
- " egd1.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd1.grid_community_id = #{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, " +
@@ -541,16 +527,10 @@
" `event` AS e2 " +
" LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id " +
" WHERE " +
- " egd2.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd2.grid_community_id = #{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, " +
@@ -561,16 +541,10 @@
" `event` AS e3 " +
" LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id " +
" WHERE " +
- " egd3.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd3.grid_community_id = #{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, " +
@@ -581,16 +555,10 @@
" `event` AS e4 " +
" LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " +
" WHERE " +
- " egd4.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd4.grid_community_id = #{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, " +
@@ -601,16 +569,10 @@
" `event` AS e5 " +
" LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " +
" WHERE " +
- " egd5.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd5.grid_community_id = #{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, " +
@@ -621,16 +583,10 @@
" `event` AS e6 " +
" LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id " +
" WHERE " +
- " egd6.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd6.grid_community_id = #{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, " +
@@ -641,16 +597,10 @@
" `event` AS e7 " +
" LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id " +
" WHERE " +
- " egd7.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd7.grid_community_id = #{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, " +
@@ -661,16 +611,10 @@
" `event` AS e8 " +
" LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id " +
" WHERE " +
- " egd8.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd8.grid_community_id = #{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, " +
@@ -681,16 +625,10 @@
" `event` AS e9 " +
" LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id " +
" WHERE " +
- " egd9.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd9.grid_community_id = #{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, " +
@@ -701,16 +639,10 @@
" `event` AS e10 " +
" LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id " +
" WHERE " +
- " egd10.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd10.grid_community_id = #{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, " +
@@ -721,51 +653,24 @@
" `event` AS e11 " +
" LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id " +
" WHERE " +
- " egd11.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd11.grid_community_id = #{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 = #{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 " +
+ " 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 " +
"FROM " +
" `event` AS e " +
" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
"WHERE " +
- " egd.grid_community_id = #{screenEventDTO.communityId} " +
+ " egd.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 1 " +
- " 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);
+ " AND event_status = 2")
+ EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);
@Select("SELECT " +
" su.nick_name AS userName, " +
@@ -807,8 +712,7 @@
" egd.grid_community_id = #{communityId}")
List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);
- @Select("<script> " +
- "SELECT " +
+ @Select("SELECT " +
" event_type AS type, " +
" e.id AS eventId, " +
" happent_lat_lng AS latLng " +
@@ -819,31 +723,20 @@
" 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 = #{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 " +
+ " AND egd.grid_community_id = #{communityId} " +
+ " AND e.create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY) UNION ALL " +
+ "SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
" id AS eventId, " +
" lng_lat AS latLng " +
"FROM " +
" com_act_easy_photo " +
"WHERE " +
- " community_id = #{screenEventDTO.communityId} " +
+ " community_id = #{communityId} " +
" AND del_tag = 0 " +
" AND lng_lat IS NOT NULL " +
- "<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);
+ " AND create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY)")
+ List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long communityId);
@Select("SELECT " +
" count( id ) AS specialTotal, " +
@@ -879,7 +772,7 @@
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}")
+ @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);
@Select(
--
Gitblit v1.7.1