From 7d9fbfdc05485c8e2cb457dffb1fd29580dfb41b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 16:02:15 +0800
Subject: [PATCH] Merge branch 'bigscreen_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
index e97a45c..e52a783 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
@@ -60,7 +60,7 @@
@Select("<script> " + " SELECT " + " SUM(CASE TYPE WHEN 1 THEN total ELSE 0 END) as 'orgCount', "
+ " SUM(CASE TYPE WHEN 2 THEN total ELSE 0 END) as 'memberCount', "
+ " SUM(CASE TYPE WHEN 3 THEN total ELSE 0 END) as 'activityCount', "
- + " SUM(CASE TYPE WHEN 4 THEN total ELSE 0 END) as 'dynCount' " + " FROM ( "
+ + " SUM(CASE TYPE WHEN 4 THEN total ELSE 0 END) as 'dynCount',SUM(CASE TYPE WHEN 5 THEN total ELSE 0 END) as 'committeeCount' " + " FROM ( "
+ " SELECT 1 AS TYPE , COUNT(id) total " + " FROM com_pb_org org "
+ " WHERE org.community_id = #{communityId} AND STATUS=1 " + " UNION ALL "
+ " SELECT 2 AS TYPE , COUNT(id) total " + " FROM com_pb_member "
@@ -68,7 +68,9 @@
+ " SELECT 3 AS TYPE , COUNT(id) total " + " FROM com_pb_activity "
+ " WHERE community_id = #{communityId} AND STATUS IN (2,3,4,5) " + " UNION ALL "
+ " SELECT 4 AS TYPE , COUNT(id) total " + " FROM com_pb_dyn "
- + " WHERE community_id = #{communityId} AND TYPE = 1 " + ") t" + "</script>")
+ + " WHERE community_id = #{communityId} AND TYPE = 1 UNION ALL " +
+ "select 5 AS TYPE,count(id) total from com_pb_member_role " +
+ "where community_id =#{communityId}" + ") t" + "</script>")
BigScreenStatisticPartyBuild partybuild(@Param("communityId") Long communityId);
@Select("<script> " + " SELECT pm.id, pm.member_id, pm.user_id, pm.name, " + " case "
--
Gitblit v1.7.1