From d874a50563d6733aa7382a618e83575f590ccfeb Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 03 二月 2021 14:34:44 +0800
Subject: [PATCH] all
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 5491e34..3090be0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -21,6 +21,7 @@
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+import java.util.Date;
import java.util.List;
/**
@@ -193,32 +194,29 @@
"COUNT(case WHEN DATE_FORMAT(last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') and continuous_landing_days>=7 then user_id else null end )activeWeekUser\n" +
"FROM\n" +
"sys_user\n" +
- "where type=1")
+ "where type=1 and community_id is not null")
IndexDataKanbanVO selectIndexDataKanban();
- @Select("select t.`name`,t.num from (\n" +
+ @Select("select t.* from (\n" +
"SELECT \n" +
- "COUNT(u.user_id)num,\n" +
- "c.`name`\n" +
+ "a.`name`,\n" +
+ "COUNT(u.user_id)num\n" +
"FROM\n" +
- "sys_user u \n" +
- "join com_act c on u.community_id=c.community_id\n" +
- "WHERE\n" +
- "u.type =1\n" +
- "GROUP BY u.community_id)t ORDER BY t.num desc limit 10")
+ "com_act a\n" +
+ "LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1\n" +
+ "GROUP BY a.community_id)t ORDER BY t.num desc ")
List<DataKanbanDTO> selectCommunityUserOrder();
- @Select("select t.`name`,t.num from (\n" +
- "SELECT \n" +
- "COUNT(u.user_id)num,\n" +
- "c.`name`\n" +
+ @Select("SELECT\n" +
+ "\tCOUNT( a.id ) num \n" +
"FROM\n" +
- "sys_user u \n" +
- "join com_act c on u.community_id=c.community_id\n" +
+ "\tcom_act_activity a \n" +
"WHERE\n" +
- "u.type =1 and DATE_FORMAT(u.last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') and u.continuous_landing_days>=7\n" +
- "GROUP BY u.community_id)t ORDER BY t.num desc limit 10")
- List<DataKanbanDTO> selectCommunityActiveUserOrder();
+ "\tDATE_FORMAT( #{date1}, '%Y-%m-%d' )= DATE_FORMAT(\n" +
+ "\t\ta.create_at,\n" +
+ "\t'%Y-%m-%d')\n" +
+ "\t")
+ DataKanbanDTO selectCommunityActiveUserOrder(Date date1);
@Select("SELECT \n" +
"COUNT(DISTINCT u.user_id)allUser,\n" +
"(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" +
--
Gitblit v1.7.1