java/zhihuishenqu.git

			@@ -67,14 +67,14 @@
			END status
			from com_pb_member as m
			LEFT JOIN sys_user su on m.id_card = su.id_card AND su.type = 1
			LEFT JOIN com_act act ON u.community_id = act.community_id
			LEFT JOIN com_act act ON su.community_id = act.community_id
			LEFT JOIN com_pb_org o ON m.org_id = o.id
			LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
			LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t1.award) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t1.sign_identity = 2
			<if test="dto.startTime !=null">
			and t.begin_at between #{dto.startTime} and #{dto.endTime}
			</if>
			GROUP BY t1.user_id ) t2 on u.user_id = t2.user_id
			GROUP BY t1.user_id ) t2 on su.user_id = t2.user_id
			<where>
			and m.audit_result = 1
			<if test='dto.orgName != null and dto.orgName != ""'>
			@@ -84,7 +84,7 @@
			and o.id = #{dto.orgId}
			</if>
			<if test='dto.account != null and dto.account != ""'>
			and u.phone like concat (#{dto.account},'%')
			and su.account like concat (#{dto.account},'%')
			</if>
			<if test='dto.name != null and dto.name != ""'>
			and m.name like concat (#{dto.name},'%')
			@@ -100,7 +100,7 @@
			</if>
			<if test="dto.keyWord != null and dto.keyWord != ''">
			and (m.name like concat (#{dto.keyWord},'%') or
			u.phone like concat (#{dto.keyWord},'%') or
			su.phone like concat (#{dto.keyWord},'%') or
			cpcu.name like concat (#{dto.keyWord},'%')
			)
			</if>