Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 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() != &quot;&quot;'>" +
            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.trim() == &quot;&quot;'>" +
            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "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() != &quot;&quot;'>" +
            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "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() != &quot;&quot;'>" +
//            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
//            " </if> " +
//            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.trim() == &quot;&quot;'>" +
//            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
//            " </if> " +
//            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
//            "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() != &quot;&quot;'>" +
//            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
//            " </if> " +
//            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
//            "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,12 @@
    @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 != &quot;&quot;'>" +
            "AND `name` like concat(#{param},'%') " +
            " </if> " +
            "</script>")
    List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param, @Param("communityId") Long communityId);

}