bug修改

Null

2021-03-20 ccde9d0c2d3a3f4c9e14ef82fe05a7b1283c1b5c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
@@ -75,8 +77,12 @@
            "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" +
@@ -84,10 +90,11 @@
            "u.create_at \n" +
            "FROM\n" +
            "sys_user u\n" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            "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.name == null or loginUserInfoVO.name.trim() == &quot;&quot;'>" +
            "<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;'>" +
@@ -220,7 +227,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(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
            "COUNT(DISTINCT case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
            "COUNT(h.id)house\n" +
            "FROM\n" +
            "sys_user u\n" +
@@ -243,4 +250,85 @@
    int updateFaceState(Long userId);
    @Select("select name from com_act where community_id=#{communityId}")
    ComActVO selectCommunity(Long communityId);
    @Select("select COUNT(a.id) from com_mng_struct_area a where a.area_name=#{areaName}")
    Integer selectCountArea(String areaName);
    @Select("SELECT\n" +
            "\tCOUNT(h.id)\n" +
            "FROM\n" +
            "\tcom_mng_struct_area a \n" +
            "\tLEFT JOIN com_mng_struct_house h on  h.parent_code=a.area_code\n" +
            "WHERE\n" +
            "\ta.area_name = #{areaName}")
    Integer selectCountHouse(String areaName);

    @Select("<script> " +
            "SELECT\n" +
            "u.user_id 'order',\n" +
            "h.house_name doorNumber,\n" +
            "if(h.state=2,'租住','自主')isRent,\n" +
            "u.`name`,\n" +
            "'汉' nation,\n" +
            "if(u.is_partymember=1,'党员','群众')politicalOutlook,\n" +
            "'未知' maritalStatus,\n" +
            "u.phone,\n" +
            "'未知' education,\n" +
            "u.id_card,\n" +
            "'未知' company,\n" +
            "'未知' residence,\n" +
            "'未知' isPanZhiHua,\n" +
            "'未知' situation,\n" +
            "'未知' isContact,\n" +
            "'未知' major,\n" +
            "'未知' soldier,\n" +
            "'未知' disability,\n" +
            "'未知' lowIncomeHouseholds,\n" +
            "'未知' lowIncomePeople,\n" +
            "'未知' oldPeople,\n" +
            "'未知' specialServiceFamily,\n" +
            "'未知' keyPersonnel\n" +
            "FROM\n" +
            "sys_user u\n" +
            "left join com_mng_struct_house_user hu on hu.user_id=u.user_id\n"+
            "left join com_mng_struct_house h on hu.house_code=h.house_code\n"+
            "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>" +
            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='exportUserDTO.areaName == null or exportUserDTO.areaName.trim() == &quot;&quot;'>" +
            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>" +
            "AND c.`area_name` like concat(#{exportUserDTO.areaName},'%')  \n" +
            " </if> " +
            " where u.community_id=#{exportUserDTO.communityId} and u.type=1 " +
            "<if test='exportUserDTO.name != null and exportUserDTO.name.trim() != &quot;&quot;'>" +
            " and u.`name` like concat(#{exportUserDTO.name},'%')  \n" +
            " </if> " +
            "<if test='exportUserDTO.phone != null and exportUserDTO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone like concat(#{exportUserDTO.phone},'%') " +
            " </if> " +
            " group by u.user_id  "+
            "</script>")
    List<EexcelUserDTO> selectExport(@Param("exportUserDTO") ExportUserDTO exportUserDTO);
    
    @Select("SELECT\n" +
            "\t COUNT(a.id)\n" +
            "FROM\n" +
            "\t com_pb_member_role a \n" +
            "WHERE\n" +
            "\t a.phone = #{phone}")
    Integer selectCountMemberRole(@Param("phone")String phone);
    
    @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);
    
    
    @Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
    void updateMemberRole(@Param("newphone")String newphone,@Param("oldphone")String oldphone);
    @Update("update com_pb_service_team u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
    void updateServiceTeam(@Param("newphone")String newphone,@Param("oldphone")String oldphone);
}