~huangh/gz-dyh.git

			@@ -226,10 +226,12 @@
			COUNT(1)
			from
			<include refid="table-name" />
			where case_id = #{caseId}
			where case_id = #{terms.caseId}
			and delete_status = 0
			and sup_status = #{supStatus}
			and quilt_unit_id = #{quiltUnitId}
			<if test="terms.quiltUnitId == 1">
			and sup_status = #{terms.supStatus}
			and quilt_unit_id = #{terms.quiltUnitId}
			</if>
			</select>

			<!-- 根据条件分页查询 -->
			@@ -238,10 +240,12 @@
			<include refid="column-part"/>
			FROM
			<include refid="table-name" />
			where case_id = #{caseId}
			where case_id = #{terms.caseId}
			and delete_status = 0
			and sup_status = #{supStatus}
			and quilt_unit_id = #{quiltUnitId}
			<if test="terms.quiltUnitId == 1">
			and sup_status = #{terms.supStatus}
			and quilt_unit_id = #{terms.quiltUnitId}
			</if>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
			isnull(${s.property}), ${s.property} ${s.direction}
			@@ -297,7 +301,7 @@

			<!-- 首页督办分页查询 -->
			<select id="pageMyTaskDb" resultMap="MyTaskApplyReviewResult">
			SELECT
			SELECT t1.id as ownerId, t1.case_id as caseId,
			t1.sup_time as turnaroundTime, DATEADD(hour, t1.reply_term, t1.sup_time) as timeLimit, t1.sup_unit_name as organizingUnit,
			t1.sup_content as opinion, t2.case_level as caseGrade, t2.canal_name as caseSource,
			t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
			@@ -306,8 +310,13 @@
			dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			t1.delete_status = 0
			and t1.sup_status = #{terms.supStatus}
			and t1.quilt_unit_id = #{terms.quiltUnitId}
			<if test="terms.quiltUnitId != null and terms.quiltUnitId !=''">
			and t1.quilt_unit_id = #{terms.quiltUnitId}
			and t1.sup_status = #{terms.supStatus}
			</if>
			<if test="terms.supUnitId != null and terms.supUnitId !=''">
			and t1.sup_unit_id = #{terms.supUnitId}
			</if>
			<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
			and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
			and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})