~huangh/gz-dyh.git

			@@ -304,7 +304,7 @@
			and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
			</if>
			<if test="terms.partyName != null and terms.partyName !=''">
			and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
			and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
			</if>
			</select>

			@@ -312,8 +312,8 @@
			<select id="pageMyTaskReturnReview" resultMap="MyTaskApplyReviewResult">
			SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
			t1.return_time as turnaroundTime, t1.return_unit_name as organizingUnit, t1.return_content as reason,
			t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
			concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
			t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
			concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
			FROM
			dyh_case_return t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			@@ -325,7 +325,7 @@
			and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
			</if>
			<if test="terms.partyName != null and terms.partyName !=''">
			and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
			and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
			</if>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">