From 75e35ac493ae4fb6f73c97f49f75788595ece875 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 13 一月 2021 17:57:41 +0800
Subject: [PATCH] 环境修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 84 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 78 insertions(+), 6 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 f2d8695..debae8a 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
@@ -4,15 +4,22 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
+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.user.AdministratorsUserVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
+import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -42,8 +49,7 @@
"u.phone,\n" +
"u.id_card,\n" +
"u.face_state,\n" +
- "c.NAME,\n" +
- "is_tanant,\n" +
+ "c.name,\n" +
"u.create_at \n" +
"FROM\n" +
"sys_user u\n" +
@@ -71,8 +77,7 @@
"u.phone,\n" +
"u.id_card,\n" +
"u.job,\n" +
- "c.NAME,\n" +
- "u.is_tanant,\n" +
+ "c.name,\n" +
"u.tags,\n" +
"u.create_at \n" +
"FROM\n" +
@@ -138,7 +143,8 @@
"u.last_login_time\n" +
"from sys_user u\n" +
"left join com_act a on u.community_id=a.community_id\n" +
- " <where>" +
+ " where\n" +
+ "u.type=1\n" +
"<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" +
"and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
" </if> " +
@@ -154,10 +160,76 @@
"<if test='pageUserAppletsBackstageDTO.lastLoginTimeBegin != null '>" +
"and u.last_login_time between #{pageUserAppletsBackstageDTO.lastLoginTimeBegin} and #{pageUserAppletsBackstageDTO.lastLoginTimeEnd}\n" +
" </if> " +
- " </where>" +
"order by u.create_at desc \n" +
"</script>")
IPage<SysUserVO> pageUserAppletsBackstage(Page page, @Param("pageUserAppletsBackstageDTO") PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO);
+
@Update("update sys_user set nick_name=null ,community_id=null,area_id=null where user_id=#{userId}")
int deleteUserTest(Long userId);
+
+ @Select("<script> " +
+ "select * from \n" +
+ "sys_user_notice \n" +
+ "where \n" +
+ "user_id=#{pageDTO.userId} \n" +
+ "<if test='pageDTO.type != null and pageDTO.type != 0'>" +
+ "and type=#{pageDTO.type}\n" +
+ " </if> " +
+ "order by create_at desc\n" +
+ "</script>")
+ IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO);
+
+ @Select("SELECT \n" +
+ "COUNT(user_id)allUser,\n" +
+ "COUNT(case WHEN DATE_FORMAT(create_at,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )addUser,\n" +
+ "COUNT(case WHEN DATE_FORMAT(last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )activeDayUser,\n" +
+ "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")
+ IndexDataKanbanVO selectIndexDataKanban();
+
+ @Select("select t.`name`,t.num from (\n" +
+ "SELECT \n" +
+ "COUNT(u.user_id)num,\n" +
+ "c.`name`\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")
+ List<DataKanbanDTO> selectCommunityUserOrder();
+
+ @Select("select t.`name`,t.num from (\n" +
+ "SELECT \n" +
+ "COUNT(u.user_id)num,\n" +
+ "c.`name`\n" +
+ "FROM\n" +
+ "sys_user u \n" +
+ "join com_act c on u.community_id=c.community_id\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();
+ @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(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
+ "COUNT(h.id)house\n" +
+ "FROM\n" +
+ "sys_user u\n" +
+ "JOIN com_act c ON u.community_id = c.community_id \n" +
+ "LEFT JOIN com_mng_struct_house_user h on u.user_id=h.user_id\n" +
+ "WHERE\n" +
+ "u.community_id =#{communityId} and u.type=1")
+ IndexDataVO indexDataCommunityBackstage(Long communityId);
+ @Update("UPDATE sys_user u \n" +
+ "SET u.continuous_landing_days =\n" +
+ "IF\n" +
+ "(\n" +
+ "DATE_FORMAT( u.last_login_time, '%m-%d-%Y' )= DATE_FORMAT( SYSDATE(), '%m-%d-%Y' ),\n" +
+ "u.continuous_landing_days + 1,\n" +
+ "0)")
+ int timedTaskContinuousLandingDays();
}
--
Gitblit v1.7.1