From 91f5824136b8a70551c95cad2ad624aa41939ddf Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 03 二月 2021 14:35:27 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 110 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 39 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 3254ed7..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
@@ -7,7 +7,10 @@
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.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;
import com.panzhihua.common.model.vos.user.SysUserVO;
@@ -18,6 +21,7 @@
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+import java.util.Date;
import java.util.List;
/**
@@ -48,22 +52,21 @@
"u.phone,\n" +
"u.id_card,\n" +
"u.face_state,\n" +
- "c.name,\n" +
+ "c.area_name communityName,\n" +
"u.create_at \n" +
"FROM\n" +
"sys_user u\n" +
- "JOIN com_act c ON u.community_id = c.community_id \n" +
- "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
- "AND c.`name` = #{loginUserInfoVO.name} \n" +
- " </if> " +
- " <where>" +
+ "JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
"<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
- "and u.`name` = #{loginUserInfoVO.communityName} \n" +
+ "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%') \n" +
+ " </if> " +
+ " where u.face_state is not null and u.type=1 and u.community_id=#{loginUserInfoVO.communityId} " +
+ "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
+ "and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
- "AND u.phone = #{loginUserInfoVO.phone}" +
+ "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
- " </where>" +
" order by u.face_state asc,u.create_at asc " +
"</script>")
IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -76,23 +79,27 @@
"u.phone,\n" +
"u.id_card,\n" +
"u.job,\n" +
- "c.name,\n" +
+ "c.area_name communityName,\n" +
"u.tags,\n" +
"u.create_at \n" +
"FROM\n" +
"sys_user u\n" +
- "LEFT JOIN com_act c ON u.community_id = c.community_id \n" +
- "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
- "AND c.`name` = #{loginUserInfoVO.communityName} \n" +
- " </if> " +
- " <where>" +
"<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
- " and u.`name` = #{loginUserInfoVO.name} \n" +
+ " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+ " </if> " +
+ "<if test='loginUserInfoVO.name == null or loginUserInfoVO.name.trim() == ""'>" +
+ "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+ " </if> " +
+ "<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} and u.type=1 " +
+ "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
+ " and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
- "AND u.phone = #{loginUserInfoVO.phone}" +
+ "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
- " </where>" +
"</script>")
IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -101,8 +108,10 @@
"u.user_id,\n" +
"u.account,\n" +
"u.`name`,\n" +
+ "u.`password`,\n" +
"u.phone,\n" +
"e.role_name,\n" +
+ "e.role_id ,\n" +
"u.`status`,\n" +
"u.create_at,\n" +
"u.last_login_time \n" +
@@ -118,13 +127,13 @@
"AND u.community_id = #{administratorsUserVO.communityId} \n" +
" </if> " +
"<if test='administratorsUserVO.name != null and administratorsUserVO.name.trim() != ""'>" +
- "AND u.name = #{administratorsUserVO.name} \n" +
+ "AND u.name like concat (#{administratorsUserVO.name},'%') \n" +
" </if> " +
"<if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != ""'>" +
- "AND u.phone = #{administratorsUserVO.phone}" +
+ "AND u.phone like concat(#{administratorsUserVO.phone},'%') " +
" </if> " +
"<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != ""'>" +
- "AND u.account = #{administratorsUserVO.account}" +
+ "AND u.account like concat(#{administratorsUserVO.account},'%') " +
" </if> " +
" </where>" +
"</script>")
@@ -185,30 +194,53 @@
"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" +
+ "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();
+ @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
+ 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