From 1aa40090d6b2339990b2fcac6aac75b96c7bc6db Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 14 七月 2021 17:19:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 101 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 63 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..1443389 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
@@ -132,7 +132,6 @@
"cmp.act_id, " +
"cmp.village_id, " +
"cmp.sex, " +
- "cmp.age, " +
"cmp.card_no, " +
"cmp.road, " +
"cmp.door_no, " +
@@ -148,7 +147,6 @@
"cmp.native_place, " +
"cmp.nation, " +
"cmp.label, " +
- "cmp.relation, " +
"cmp.marriage, " +
"cmp.culture_level, " +
"cmp.out_or_local, " +
@@ -156,6 +154,7 @@
"cmp.healthy, " +
"cmp.birthday, " +
"cmp.update_at, " +
+ "cmp.address, " +
"cmp.is_rent " +
"FROM " +
"com_mng_population AS cmp " +
@@ -163,6 +162,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 +217,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 +240,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);
@@ -440,11 +454,6 @@
" count( egd.id ) AS gridTotal, " +
" ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
" ( " +
- " SELECT " +
- " count( e.id ) " +
- " FROM " +
- " `event` AS e " +
- " LEFT JOIN event_grid_data AS egd1 ON e.grid_id = egd1.id " +
" WHERE " +
" egd1.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
@@ -457,10 +466,6 @@
" ) AS eventTotal, " +
" ( " +
" SELECT " +
- " count( e1.id ) " +
- " FROM " +
- " `event` AS e1 " +
- " LEFT JOIN event_grid_data AS egd2 ON e1.grid_id = egd2.id " +
" WHERE " +
" egd2.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
@@ -473,11 +478,6 @@
" AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
" ( " +
" SELECT " +
- " count( e1.id ) " +
- " FROM " +
- " `event` AS e1 " +
- " LEFT JOIN event_grid_data AS egd2 ON e1.grid_id = egd2.id " +
- " WHERE " +
" egd2.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
" AND event_deal_status = 4 " +
@@ -494,6 +494,7 @@
" egd.grid_community_id = #{screenEventDTO.communityId} " +
" </script>")
EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
@Select("SELECT " +
" DATE_FORMAT( e.create_at, '%m' ) months " +
@@ -516,12 +517,11 @@
" count( e.id ) AS eventZATotal, " +
" IFNULL(( " +
" SELECT " +
- " count( e1.id ) " +
- " FROM " +
" `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 " +
@@ -534,14 +534,11 @@
" ), " +
" 0 " +
" ) AS yesEventZATotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e2.id ) " +
- " FROM " +
" `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 " +
@@ -554,14 +551,11 @@
" ), " +
" 0 " +
" ) AS eventTFTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e3.id ) " +
- " FROM " +
" `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 " +
@@ -574,14 +568,11 @@
" ), " +
" 0 " +
" ) AS yesEventTFTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e4.id ) " +
- " FROM " +
" `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 " +
@@ -594,14 +585,11 @@
" ), " +
" 0 " +
" ) AS eventTSTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e5.id ) " +
- " FROM " +
" `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 " +
@@ -614,14 +602,11 @@
" ), " +
" 0 " +
" ) AS yesEventTSTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e6.id ) " +
- " FROM " +
" `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 " +
@@ -634,14 +619,11 @@
" ), " +
" 0 " +
" ) AS eventMDTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e7.id ) " +
- " FROM " +
" `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 " +
@@ -654,14 +636,11 @@
" ), " +
" 0 " +
" ) AS yesEventMDTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e8.id ) " +
- " FROM " +
" `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 " +
@@ -674,14 +653,11 @@
" ), " +
" 0 " +
" ) AS eventBWDTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e9.id ) " +
- " FROM " +
" `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 " +
@@ -694,14 +670,11 @@
" ), " +
" 0 " +
" ) AS yesEventBWDTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e10.id ) " +
- " FROM " +
" `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 " +
@@ -714,14 +687,11 @@
" ), " +
" 0 " +
" ) AS eventGGTotal, " +
- " IFNULL(( " +
- " SELECT " +
- " count( e11.id ) " +
- " FROM " +
" `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 " +
@@ -750,11 +720,14 @@
" 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 " +
@@ -766,6 +739,7 @@
" </if> " +
" </script>")
EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
@Select("SELECT " +
" su.nick_name AS userName, " +
@@ -812,10 +786,6 @@
" event_type AS type, " +
" e.id AS eventId, " +
" happent_lat_lng AS latLng " +
- "FROM " +
- " `event` AS e " +
- " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
- "WHERE " +
" e.event_category = 1 " +
" AND e.event_type IN ( 1, 2, 3, 4, 5, 6 ) " +
" AND e.event_status = 2 " +
@@ -827,6 +797,9 @@
" 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 " +
@@ -834,6 +807,7 @@
" 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 != ""'>" +
@@ -844,6 +818,7 @@
" </if> " +
" </script>")
List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
@Select("SELECT " +
" count( id ) AS specialTotal, " +
@@ -879,7 +854,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