From b69bc7c024582dadf34f88e43ff0bcc0f8e07f9f Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 20:01:13 +0800
Subject: [PATCH] 特殊群体标签重复bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 104 ++++++++++++++++++++++++++++++---------------------
1 files changed, 61 insertions(+), 43 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 68dd1f6..90568f6 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
@@ -11,11 +11,13 @@
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.AppletUserInfoVO;
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.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;
@@ -23,14 +25,12 @@
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
@@ -79,43 +79,43 @@
"</script>")
IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
- @Select("<script> " +
- "SELECT\n" +
- "u.user_id,\n" +
- "u.`name`,\n" +
- "u.`sex`,\n" +
- "u.nick_name,\n" +
- "u.phone,\n" +
- "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
- "1 isRegister,\n"+
- "v.political_face political_outlook,\n"+
- "u.id_card,\n" +
- "u.job,\n" +
- "c.area_name communityName,\n" +
- "u.tags,\n" +
- "u.create_at \n" +
- "FROM\n" +
- "sys_user u\n" +
- "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
- "<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} 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 like concat(#{loginUserInfoVO.phone},'%') " +
- " </if> " +
- " order by u.user_id desc " +
- "</script>")
- IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
+// @Select("<script> " +
+// "SELECT\n" +
+// "u.user_id,\n" +
+// "u.`name`,\n" +
+// "u.`sex`,\n" +
+// "u.nick_name,\n" +
+// "u.phone,\n" +
+// "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
+// "1 isRegister,\n"+
+// "v.political_face political_outlook,\n"+
+// "u.id_card,\n" +
+// "u.job,\n" +
+// "c.area_name communityName,\n" +
+// "u.tags,\n" +
+// "u.create_at \n" +
+// "FROM\n" +
+// "sys_user u\n" +
+// "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
+// "<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} 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 like concat(#{loginUserInfoVO.phone},'%') " +
+// " </if> " +
+// " order by u.user_id desc " +
+// "</script>")
+ IPage<AppletUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") AppletUserInfoVO userInfoVO);
@Select("<script> " +
"SELECT\n" +
@@ -412,7 +412,25 @@
"</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") Long userName);
+ @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