java/zhihuishenqu.git

			@@ -58,9 +58,10 @@

			<select id="findListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO">
			select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.visiter_sex,vt.visiter_address,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status,
			TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code
			TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code,vt.exception,vt.grid_member_name,vt.grid_menber_tele,egd.grid_name AS gridName
			from event_visiting_tasks vt left join com_mng_population p on vt.visiter_id = p.id
			left join sys_user u on vt.create_by = u.user_id
			left join event_grid_data egd on egd.id = vt.grid_id
			where 1=1
			<if test = "query.communityId != null">
			and p.act_id = #{query.communityId}
			@@ -108,7 +109,7 @@
			</select>

			<select id="list" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.AppVisitTasksVO">
			SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,u.name as creator,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
			SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.grid_menber_tele,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,u.name as creator,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
			p.card_no_str,vt.exception,p.name,REPLACE(p.label,',','#')
			FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id
			left join sys_user u on vt.create_by = u.user_id
			@@ -172,7 +173,7 @@
			</select>

			<select id="countNoneComplete" resultType="java.lang.Integer">
			SELECT count(id) from event_visiting_tasks where visiter_id = #{id} and (event_status = 1 or event_status = 2 or event_status = 4)
			SELECT count(id) from event_visiting_tasks where visiter_id = #{id} and event_status = 1
			</select>

			<update id="updateEventStatus">