From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 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 c5b6c75..200896c 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,6 +11,7 @@
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;
@@ -18,6 +19,8 @@
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.partybuilding.ComPbServiceTeamVO;
+import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
@@ -78,43 +81,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" +
@@ -432,4 +435,15 @@
@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);
+ @Select("<script>" +
+ "select id as managerId,`name` from com_pb_service_team where community_id = #{communityId}" +
+ "<if test='param != null and param != ""'>" +
+ "AND `name` like concat(#{param},'%') " +
+ " </if> " +
+ "</script>")
+ List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param, @Param("communityId") Long communityId);
+
+ @Select("select user_id,`name` from sys_user as su where type = 3 and community_id = #{communityId}")
+ List<SysUserVO> getUserListByCommunityId(@Param("communityId") Long communityId);
+
}
--
Gitblit v1.7.1