From 61e898a41843a61f2314efcb1b874ac3c2073bad Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 12 十月 2021 15:43:29 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 efbec6a..900c555 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
@@ -240,8 +240,8 @@
+ " 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} "
+ + " LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " + " WHERE " + " event_category = 2 "
+ + " 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 "
--
Gitblit v1.7.1