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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java

@@ -42,7 +42,7 @@
            "com_mng_volunteer_mng \n" +
            " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            " and name = #{comMngVolunteerMngVO.name} \n" +
            " and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
@@ -53,50 +53,43 @@

    @Select("<script> " +
            "SELECT\n" +
            "id,\n" +
            "`name`,\n" +
            "state,\n" +
            "phone,\n" +
            "create_at \n" +
            "t.id,\n" +
            "t.`name`,\n" +
            "t.state,\n" +
            "t.phone,\n" +
            "t.apply_reson,\n" +
            "t.create_at, " +
            "t.submit_user_id \n" +
            "FROM\n" +
            "com_mng_volunteer_mng \n" +
            "com_mng_volunteer_mng t\n" +
            " RIGHT JOIN \n" +
            "(select submit_user_id, MAX(create_at)create_at  from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY submit_user_id ) tmp \n" +
            "on t.create_at = tmp.create_at and t.submit_user_id=tmp.submit_user_id "+
            "WHERE\n" +
            "state in (1,3)\n" +
            "state in (1,3)  and community_id=#{comMngVolunteerMngVO.communityId} \n" +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            "and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            "and t.name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" +
            "AND t.phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.state != null and comMngVolunteerMngVO.state != 0'>" +
            "and state=#{comMngVolunteerMngVO.state}\n" +
            "and t.state=#{comMngVolunteerMngVO.state}\n" +
            " </if> " +
            "ORDER BY state asc " +
            " \tORDER BY t.state asc  " +
            "</script>")
    IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
    @Select("SELECT\n" +
            "'人脸采集' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增人脸采集信息待审核' words \n" +
            "FROM\n" +
            "sys_user u \n" +
            "WHERE\n" +
            "u.face_state = 0 \n" +
            "AND u.community_id = #{communityId} \n" +
            "GROUP BY\n" +
            "u.community_id UNION ALL\n" +
    @Select(
            "SELECT\n" +
            "'志愿者审核' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增志愿者申请待审核' words \n" +
            "'4' type\n" +
            "FROM\n" +
            "com_mng_volunteer_mng v \n" +
            "WHERE\n" +
            "v.state = 1 \n" +
            "AND v.`community_id` = #{communityId} \n" +
            "GROUP BY\n" +
            "v.community_id")
            "AND v.`community_id` = #{communityId} \n"
           )
    List<TodoEventsVO> selectNeedToDo(Long communityId);
    @Select("select user_id from sys_user where type=1 and phone=#{phone}")
    Long selectUserIdByPhone(String phone);

}