From d2fe6196f1991d10b48adf2debf8521b34f4c461 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 27 四月 2021 10:04:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 43cf297..fdb8c3d 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
@@ -16,12 +16,14 @@
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.common.model.vos.user.UpdateUserArchivesVO;
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 org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -198,7 +200,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")
@@ -331,4 +333,26 @@
void updateMemberRole(@Param("newphone")String newphone,@Param("oldphone")String oldphone);
@Update("update com_pb_service_team u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
void updateServiceTeam(@Param("newphone")String newphone,@Param("oldphone")String oldphone);
+
+ @Select("SELECT\n" +
+ "\t COUNT(ur.role_id) \n" +
+ "FROM\n" +
+ "\t sys_user u LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id \n" +
+ "\t LEFT JOIN sys_role r ON ur.role_id = r.role_id \n" +
+ "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} ")
+ Integer selectCountSysUser(@Param("phone")String phone);
+
+ @Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}")
+ void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId);
+
+ @Select("delete from com_shop_store where delete_status = 1 and phone = #{phone}")
+ void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone);
+
+ @Select("update sys_user set" +
+ " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
+ ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
+ ",family_book = #{userArchivesVO.familyBook} \n" +
+ " where user_id = #{userArchivesVO.userId}")
+ void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
+
}
--
Gitblit v1.7.1