From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 86 ------------------------------------------
1 files changed, 1 insertions(+), 85 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 63790e5..14b1d17 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
@@ -107,45 +107,6 @@
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
"AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
-
- "union all "+
- "SELECT \n" +
- "u.id+100000000 user_id,\n" +
- "u.`name`,\n" +
- "case if(length(u.id_card)=18, cast(substring(u.id_card,17,1) as UNSIGNED)%2, if(length(u.id_card)=15,cast(substring(u.id_card,15,1) as UNSIGNED)%2,3)) \n" +
- "when 1 then 1\n" +
- "when 0 then 2\n" +
- "else 0\n" +
- "end as sex,\n" +
- "'' nick_name,\n" +
- "u.phone,\n" +
- "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n" +
- "if(su.user_id is null ,0,1)isRegister,\n" +
- "u.political_outlook,\n" +
- "u.id_card,\n" +
- "'' job,\n" +
- "c.area_name communityName,\n" +
- "CONCAT(if(u.soldier=1,'军人,',''),if(u.lowIncome_households=1,'低保户,',''),if(u.lowIncome_people=1,'低收入,',''),if(u.old_people=1,'特服家庭,',''),if(u.key_personnel=1,'重点人员,',''))tags,\n" +
- "u.create_at\n" +
- "FROM\n" +
- "\tsys_user_input u\n" +
- "\tLEFT JOIN sys_user su on su.id_card=u.id_card"+
- "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
- " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
- " </if> " +
- "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.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} " +
- "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
- "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
- " </if> " +
- "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
- " and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
- " </if> " +
"</script>")
IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -237,7 +198,7 @@
"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" +
+ "(SELECT count(user_id) FROM sys_user WHERE type = 1 AND last_login_time > date_sub(SYSDATE(), INTERVAL 7 DAY))activeWeekUser\n" +
"FROM\n" +
"sys_user\n" +
"where type=1 and community_id is not null")
@@ -346,51 +307,6 @@
"AND u.phone like concat(#{exportUserDTO.phone},'%') " +
" </if> " +
" group by u.user_id "+
-
- "union all "+
- "SELECT \n" +
- "u.id+100000000 'order',\n" +
- "u.door_number doorNumber,\n" +
- "if(u.is_rent=1,'租住','自主')isRent,\n" +
- "u.name,\n" +
- "u.nation,\n" +
- "case u.political_outlook when 1 then '党员' when 2 then '团员' else '群众' end politicalOutlook,\n" +
- "if(u.marital_status=1,'已婚','未婚')maritalStatus,\n" +
- "u.phone,\n" +
- "u.education,\n" +
- "u.id_card,\n" +
- "u.company,\n" +
- "u.residence,\n" +
- "if(u.is_panzhiHua=1,'是','否') isPanZhiHua,\n" +
- "u.situation,\n" +
- "if(is_contact=1,'是','否') isContact,\n" +
- "if(u.major=1,'是','否') major,\n" +
- "if(u.soldier=1,'是','否') soldier,\n" +
- "if(u.disability=1,'是','否') disability,\n" +
- "if(u.lowIncome_households=1,'是','否') lowIncomeHouseholds,\n" +
- "if(u.lowIncome_people=1,'是','否') lowIncomePeople,\n" +
- "if(u.old_people=1,'是','否') oldPeople,\n" +
- "if(u.special_service_family=1,'是','否') specialServiceFamily,\n" +
- "if(u.key_personnel=1,'是','否') keyPersonnel\n" +
- "FROM\n" +
- "\tsys_user_input u\n" +
- "\tLEFT JOIN sys_user su on su.id_card=u.id_card"+
- "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != ""'>" +
- " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
- " </if> " +
- "<if test='exportUserDTO.areaName == null or exportUserDTO.areaName.trim() == ""'>" +
- "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
- " </if> " +
- "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != ""'>" +
- "AND c.`area_name` like concat(#{exportUserDTO.areaName},'%') \n" +
- " </if> " +
- " where u.community_id=#{exportUserDTO.communityId} " +
- "<if test='exportUserDTO.phone != null and exportUserDTO.phone.trim() != ""'>" +
- "AND u.phone like concat(#{exportUserDTO.phone},'%') " +
- " </if> " +
- "<if test='exportUserDTO.name != null and exportUserDTO.name.trim() != ""'>" +
- " and u.`name` like concat(#{exportUserDTO.name},'%') \n" +
- " </if> " +
"</script>")
List<EexcelUserDTO> selectExport(@Param("exportUserDTO") ExportUserDTO exportUserDTO);
--
Gitblit v1.7.1