From d2baab8c43dca88365dac6e98a95ceee644001e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 09:47:53 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 15 +--------------
1 files changed, 1 insertions(+), 14 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 fa97328..8730c16 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
@@ -537,7 +537,6 @@
" 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 " +
@@ -558,7 +557,6 @@
" 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 " +
@@ -579,7 +577,6 @@
" 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 " +
@@ -600,7 +597,6 @@
" 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 " +
@@ -621,7 +617,6 @@
" 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 " +
@@ -642,7 +637,6 @@
" 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 " +
@@ -663,7 +657,6 @@
" 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 " +
@@ -684,7 +677,6 @@
" 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 " +
@@ -705,7 +697,6 @@
" 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 " +
@@ -726,7 +717,6 @@
" 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 " +
@@ -747,7 +737,6 @@
" 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 " +
@@ -776,8 +765,6 @@
" 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 " +
@@ -854,7 +841,7 @@
" AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
" </if> " +
"UNION ALL SELECT " +
- " AND egd.grid_community_id = #{communityId} " +
+ " AND egd.grid_community_id = #{screenEventDTO.communityId} " +
" AND e.create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY) UNION ALL " +
"SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
--
Gitblit v1.7.1