From 10b8730043e823efaf7fdea209e7e63f08b9bc4e Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期六, 20 二月 2021 09:45:14 +0800
Subject: [PATCH] zuul
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 5982be6..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
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -20,6 +21,7 @@
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+import java.util.Date;
import java.util.List;
/**
@@ -91,7 +93,7 @@
"<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
"AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%') \n" +
" </if> " +
- " where u.community_id=#{loginUserInfoVO.communityId} " +
+ " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
"<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
" and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
@@ -192,35 +194,32 @@
"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(u.user_id)allUser,\n" +
- "COUNT(case when u.is_volunteer=1 then u.user_id else null end )volunteerUser,\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" +
"COUNT(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
"COUNT(h.id)house\n" +
"FROM\n" +
@@ -242,4 +241,6 @@
ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
@Update("update sys_user set face_state=null where user_id=#{userId}")
int updateFaceState(Long userId);
+ @Select("select name from com_act where community_id=#{communityId}")
+ ComActVO selectCommunity(Long communityId);
}
--
Gitblit v1.7.1