From 04ee9afc3f33f48327e360be965f882ffd2c16be Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 16:00:52 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 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 e61363b..c5b6c75 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,20 +16,20 @@
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.community.screen.event.EventGridMemberVO;
+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;
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.apache.ibatis.annotations.*;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -109,6 +112,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);
@@ -363,4 +367,69 @@
@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);
+
+ @Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}")
+ void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") String userName);
+
+ @Delete("delete from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
+ void delLcMember(@Param("gridMemberId") Long gridMemberId);
+
+ @Select("select id,village_id,act_id from com_mng_building where id = #{buildingId}")
+ Map<String,Long> getBuilding(@Param("buildingId") Long buildingId);
+
+ @Delete("delete from event_grid_member_building_relation where grid_member_id = #{gridMemberId}")
+ void delGridMemberRelation(@Param("gridMemberId") Long gridMemberId);
+
+ @Select("select lc_grid_member_id,lc_grid_member_name,lc_bind_user_id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
+ Map<String,String> getLcMemberId(@Param("gridMemberId") Long gridMemberId);
+
+ @Select("select count(id) from event_grid_member_relation where grid_member_id = #{userId}")
+ Integer getGridIsOk(@Param("userId") Long userId);
+
+ @Select("select user_id,nick_name,phone from sys_user where type = 6 and community_id = #{communityId} limit 3")
+ List<EventGridMemberVO> getGridsMemberList(@Param("communityId") Long communityId);
+
}
--
Gitblit v1.7.1