java/zhihuishenqu.git

			@@ -116,7 +116,7 @@
			select
			m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
			m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
			m.specialty_name, m.position_two, o.`name` orgName,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
			canct.name as specialty_name, m.position_two, m.org_name,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
			TIMESTAMPDIFF(
			YEAR,
			m.employment_time,
			@@ -130,6 +130,7 @@
			LEFT JOIN sys_user u ON m.id_card = u.id_card and u.type = 1
			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 com_act_neighbor_circle_topic canct on m.specialty_category = canct.id
			LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3
			<if test="dto.startTime !=null">
			and t.begin_at between #{dto.startTime} and #{dto.endTime}