From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 8 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
index 1ada6ce..a6f25e4 100644
--- a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
@@ -277,11 +277,31 @@
<!-- 鏌ヨ灏忓尯鎴愬憳 add by wuxw 2018-07-03 -->
<select id="getCommunityMember" parameterType="Map" resultType="Map">
- select ms.community_member_id ,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd,
+ select ms.community_member_id , ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd,
ms.community_member_id communityMemberId ,ms.b_id bId,ms.community_id communityId,ms.member_id memberId,ms.member_type_cd memberTypeCd,ms.status_cd statusCd,
- ms.audit_status_cd auditStatusCd
+ ms.audit_status_cd auditStatusCd,
+ (CASE
+ WHEN ms.audit_status_cd='1000'
+ THEN '寰呭鏍�'
+ WHEN ms.audit_status_cd = '1100'
+ THEN '瀹℃牳瀹屾垚'
+ ELSE
+ '瀹℃牳鎷掔粷'
+ END) stateName
+ <if test="needCommunityInfo == true">
+ ,sc.name
+ </if>
from s_community_member ms
+ <if test="needCommunityInfo == true">
+ ,s_community sc,
+ s_community_member msc
+ </if>
where 1=1
+ <if test="needCommunityInfo == true">
+ and sc.`community_id` = ms.`community_id`
+ AND sc.`status_cd` = '0'
+ and sc.state='1100'
+ </if>
<if test="statusCd != null and statusCd != ''">
and ms.status_cd = #{statusCd}
</if>
@@ -292,8 +312,18 @@
<if test="communityMemberId != null and communityMemberId !=''">
and ms.community_member_id = #{communityMemberId}
</if>
- <if test="memberId != null and memberId != ''">
+ <if test="memberId != null and memberId != '' and needCommunityInfo == true">
+ AND ms.`community_id` = msc.`community_id`
+ and msc.member_id = #{memberId}
+ </if>
+ <if test="memberId != null and memberId != '' and needCommunityInfo == false">
and ms.member_id = #{memberId}
+ </if>
+ <if test="subMemberId != null and subMemberId != ''">
+ and ms.member_id = #{memberId}
+ </if>
+ <if test="noAuditEnterCommunity == true">
+ and ms.member_type_cd not in ('390001200003','390001200005','390001200000')
</if>
<if test="memberTypeCd != null and memberTypeCd != ''">
and ms.member_type_cd = #{memberTypeCd}
@@ -305,6 +335,10 @@
<if test="communityId != null and communityId != ''">
and ms.community_id = #{communityId}
</if>
+ <if test="communityName != null and communityName != '' and needCommunityInfo == true">
+ and sc.name like concat('%',#{communityName},'%')
+ </if>
+ order by ms.create_time desc
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
@@ -333,7 +367,16 @@
<select id="getCommunityMemberCount" parameterType="Map" resultType="Map">
select count(1) count
from s_community_member ms
+ <if test="needCommunityInfo == true">
+ ,s_community sc,
+ s_community_member msc
+ </if>
where 1=1
+ <if test="needCommunityInfo == true">
+ and sc.`community_id` = ms.`community_id`
+ AND sc.`status_cd` = '0'
+ and sc.state='1100'
+ </if>
<if test="statusCd != null and statusCd != ''">
and ms.status_cd = #{statusCd}
</if>
@@ -344,9 +387,22 @@
<if test="communityMemberId != null and communityMemberId !=''">
and ms.community_member_id = #{communityMemberId}
</if>
- <if test="memberId != null and memberId != ''">
+ <if test="memberId != null and memberId != '' and needCommunityInfo == true">
+ AND ms.`community_id` = msc.`community_id`
+ and msc.member_id = #{memberId}
+ </if>
+ <if test="memberId != null and memberId != '' and needCommunityInfo == false">
and ms.member_id = #{memberId}
</if>
+
+ <if test="subMemberId != null and subMemberId != ''">
+ and ms.member_id = #{memberId}
+ </if>
+
+ <if test="noAuditEnterCommunity == true">
+ and ms.member_type_cd not in ('390001200003','390001200005','390001200000')
+ </if>
+
<if test="memberTypeCd != null and memberTypeCd != ''">
and ms.member_type_cd = #{memberTypeCd}
</if>
@@ -354,8 +410,17 @@
and ms.audit_status_cd = #{auditStatusCd}
</if>
+ <if test="auditStatusCds != null and auditStatusCds != null">
+ and ms.audit_status_cd in
+ <foreach collection="auditStatusCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId != null and communityId != ''">
and ms.community_id = #{communityId}
+ </if>
+ <if test="communityName != null and communityName != '' and needCommunityInfo == true">
+ and sc.name like concat('%',#{communityName},'%')
</if>
</select>
@@ -387,13 +452,19 @@
and t.city_code= #{cityCode}
</if>
<if test="name !=null and name != ''">
- and t.name= #{name}
+ and t.name like concat('%',#{name},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="communityIds !=null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -411,6 +482,15 @@
and cm.community_id = t.community_id
and cm.member_id = #{memberId}
and cm.status_cd = '0'
+ </if>
+ <if test="memberId !=null and memberId !='' and auditStatusCd != null and auditStatusCd !=''">
+ and cm.audit_status_cd = #{auditStatusCd}
+ </if>
+ <if test="notInCommunityId != null ">
+ and t.community_id not in
+ <foreach collection="notInCommunityId" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -438,13 +518,19 @@
and t.city_code= #{cityCode}
</if>
<if test="name !=null and name != ''">
- and t.name= #{name}
+ and t.name like concat('%',#{name},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="communityIds !=null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -460,8 +546,17 @@
</if>
<if test="memberId !=null and memberId !=''">
and cm.community_id = t.community_id
- and cm.member_id = #{memberId}
- and cm.status_cd = '0'
+ and cm.member_id = #{memberId}
+ and cm.status_cd = '0'
+ </if>
+ <if test="memberId !=null and memberId !='' and auditStatusCd != null and auditStatusCd !=''">
+ and cm.audit_status_cd = #{auditStatusCd}
+ </if>
+ <if test="notInCommunityId != null ">
+ and t.community_id not in
+ <foreach collection="notInCommunityId" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
--
Gitblit v1.8.0