From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 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 ad1b6d6..6183b53 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
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
+import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
@@ -13,6 +16,7 @@
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.grid.GridMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
@@ -109,6 +113,7 @@
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
"AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
+ " order by u.user_id desc " +
"</script>")
IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -161,7 +166,7 @@
"from sys_user u\n" +
"left join com_act a on u.community_id=a.community_id\n" +
" where\n" +
- "u.type=1 and community_id is not null \n" +
+ "u.type=1 and u.community_id is not null \n" +
"<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" +
"and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
" </if> " +
@@ -229,7 +234,7 @@
@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(DISTINCT case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
+ " (select count(id) from com_pb_member cpm where cpm.audit_result = 1 and cpm.community_id = #{communityId}) partymemberUser,\n" +
"COUNT(h.id)house\n" +
"FROM\n" +
"sys_user u\n" +
@@ -246,7 +251,8 @@
"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")
+ @Select("select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id " +
+ " 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);
@@ -317,16 +323,16 @@
"FROM\n" +
"\t com_pb_member_role a \n" +
"WHERE\n" +
- "\t a.phone = #{phone}")
- Integer selectCountMemberRole(@Param("phone")String phone);
+ "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
+ Integer selectCountMemberRole(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Select("SELECT\n" +
"\t COUNT(a.id)\n" +
"FROM\n" +
"\t com_pb_service_team a \n" +
"WHERE\n" +
- "\t a.phone = #{phone}")
- Integer selectCountTeam(@Param("phone")String phone);
+ "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
+ Integer selectCountTeam(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
@@ -339,8 +345,8 @@
"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);
+ "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} and r.community_id=#{userCommunityId} ")
+ Integer selectCountSysUser(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}")
void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId);
@@ -352,7 +358,58 @@
" card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
",family_book = #{userArchivesVO.familyBook} \n" +
+ ",job = #{userArchivesVO.job} \n" +
" where user_id = #{userArchivesVO.userId}")
void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
+ @Select("update com_pb_member set user_id = #{userId} where audit_result = 1 and id_card = #{idCard}")
+ void updateComPbMemberUserId(@Param("idCard")String idCard, @Param("userId")Long userId);
+
+ @Select("select id from com_pb_member where audit_result = 1 and id_card = #{idCard}")
+ Long getPartyBuildingByIdCard(@Param("idCard")String idCard);
+
+ @Select("<script>" +
+ "select su.user_id,su.image_url,su.nick_name,su.account,su.phone,su.work_status,su.`status`" +
+ ",ca.name as communityName,su.work_start_time,su.work_end_time from sys_user su" +
+ " left join com_act as ca on ca.community_id = su.community_id" +
+ " where su.type = 6 " +
+ "<if test='memberRelationDTO.status != null'>" +
+ "AND su.status = #{memberRelationDTO.status} " +
+ " </if> " +
+ "<if test='memberRelationDTO.gridCommunityId != null'>" +
+ "AND ca.community_id = #{memberRelationDTO.gridCommunityId} " +
+ " </if> " +
+ "<if test='memberRelationDTO.gridStreetId != null'>" +
+ "AND ca.street_id = #{memberRelationDTO.gridStreetId} " +
+ " </if> " +
+ "<if test='memberRelationDTO.workStatus != null'>" +
+ "AND su.work_status = #{memberRelationDTO.workStatus} " +
+ " </if> " +
+ "<if test='memberRelationDTO.keyWord != null and memberRelationDTO.keyWord != ""'>" +
+ "and (su.nick_name like concat(#{memberRelationDTO.keyWord},'%') OR su.user_id = #{memberRelationDTO.keyWord} OR su.account like concat(#{memberRelationDTO.keyWord},'%') OR su.phone like concat(#{memberRelationDTO.keyWord},'%'))" +
+ " </if> " +
+ " order by su.create_at desc" +
+ "</script>")
+ IPage<GridMemberVO> getGridMemberList(Page page, @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);
+
+ @Select("<script>" +
+ "update sys_user" +
+ " set status = #{gridMemberEditDTO.status}" +
+ " where user_id in " +
+ "<foreach item=\"item\" collection=\"gridMemberEditDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" +
+ "#{item}\n" +
+ "</foreach>\n" +
+ "</script>")
+ void gridMemberEditStatus(@Param("gridMemberEditDTO") EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ @Select("<script>" +
+ "update sys_user" +
+ " set password = #{gridMemberDTO.password}" +
+ " where user_id in " +
+ "<foreach item=\"item\" collection=\"gridMemberDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" +
+ "#{item}\n" +
+ "</foreach>\n" +
+ "</script>")
+ void passResetUser(@Param("gridMemberDTO") EventGridMemberPassResetDTO gridMemberDTO);
+
}
--
Gitblit v1.7.1