Merge branch 'test' into 'master'

罗yu 元桥

2021-04-30 1abee89cd55e34fc51102d23f984e3d56ed01647

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -118,4 +118,42 @@
            "order by m.join_time desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyBuildingMemberVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);

    @Select("<script> " +
            "SELECT\n" +
            "o.`name` orgName,\n" +
            "m.org_id,\n"+
            "m.id_card,\n"+
            "m.`id`,\n" +
            "u.phone,\n" +
            "m.`name`,\n" +
            "m.photo_path,\n" +
            "TIMESTAMPDIFF(\n" +
            "YEAR,\n" +
            "m.employment_time,\n" +
            "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" +
            "m.join_time,\n" +
            "m.audit_result, \n" +
            "m.employment_time,\n" +
            "CASE\n" +
            "WHEN u.id_card IS NULL THEN\n" +
            "'未注册' ELSE '已注册' \n" +
            "END STATUS \n" +
            "FROM\n" +
            "com_pb_member m\n" +
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
            "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
            " where m.audit_result in (0,3)  " +
            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone.trim() != &quot;&quot;'>" +
            " and u.phone = #{pagePartyBuildingMemberVO.phone} "+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != &quot;&quot;'>" +
            " and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != &quot;&quot;'>" +
            " and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+
            " </if> " +
            " order by m.join_time desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
}