From 1abee89cd55e34fc51102d23f984e3d56ed01647 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 30 四月 2021 15:35:36 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
index ae9a834..d9dcf5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
+++ b/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() != ""'>" +
+ " and u.phone = #{pagePartyBuildingMemberVO.phone} "+
+ " </if> " +
+ "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != ""'>" +
+ " and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+
+ " </if> " +
+ "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != ""'>" +
+ " and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+
+ " </if> " +
+ " order by m.join_time desc "+
+ "</script>")
+ IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
}
--
Gitblit v1.7.1