~huangh/gz-dyh.git

			@@ -429,7 +429,7 @@
			dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			(t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
			and sign_status != 1
			and t1.sign_status != 1
			and t2.delete_status = 0
			<include refid="myTaskFp-where-part"/>
			</select>
			@@ -445,7 +445,7 @@
			dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			(t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
			and sign_status != 1
			and t1.sign_status != 1
			and t2.delete_status = 0
			<include refid="myTaskFp-where-part"/>
			<if test="page.sort != null">
			@@ -515,6 +515,17 @@
			order by isnull(t1.create_time), t1.create_time desc
			</if>
			limit #{page.offset}, #{page.size}
			</select>

			<!-- 全部签收-查询未签收所有Id -->
			<select id="listIdByTerms" resultType="cn.huge.module.cases.domain.dto.SignTaskDTO">
			SELECT t1.id as caseTaskId, t1.case_id as caseId
			FROM
			dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			t2.delete_status = 0
			and t1.status = '1'
			<include refid="myTaskQs-where-part"/>
			</select>


			@@ -643,37 +654,86 @@

			<!-- 首页-待审核-我申请的条件统计 -->
			<select id="countMyTaskShWSQD" resultType="java.lang.Long">
			select
			COUNT(t1.id)
			select sum(t1.count)
			from
			dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			t1.cande_unit_id = #{terms.candeUnitId}
			and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
			and t2.delete_status = 0
			and t1.sign_status != 1
			and t1.status = #{terms.status}
			<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})
			</if>
			<if test="terms.partyName != null and terms.partyName !=''">
			and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
			</if>
			(
			SELECT count(1) as count, case_id as caseId
			FROM dyh_case_return
			WHERE return_unit_id = #{terms.applyUnitId}
			union all
			SELECT count(1) as count, case_id as caseId
			FROM dyh_case_windup_apply
			WHERE apply_unit_id = #{terms.applyUnitId}
			union all
			SELECT count(1) as count, case_id as caseId
			FROM dyh_case_appear
			WHERE appear_unit_id = #{terms.applyUnitId}
			union all
			SELECT count(1) as count, case_id as caseId
			FROM dyh_case_assist_apply
			WHERE apply_unit_id = #{terms.applyUnitId}
			)t1 left join dyh_case_info t2 on t1.caseId = t2.id
			<where>
			<if test="terms.applyType != null and terms.applyType !=''">
			and t1.applyType = #{terms.applyType}
			</if>
			<if test="terms.auditStatus != null and terms.auditStatus !=''">
			and t1.audit_result = #{terms.auditResult}
			</if>
			<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
			and (DATE_FORMAT(t1.turnaroundTime,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
			and DATE_FORMAT(t1.turnaroundTime,'%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}, '%')
			</if>
			</where>
			</select>
			<!-- 首页-待审核-我申请的分页查询 -->
			<select id="pageMyTaskShWSQD" resultMap="MyTaskApplyReviewResult">
			select caseId as caseId, return_time as turnaroundTime, '回退' as applyType, audit_unit_name as auditDept,
			return_status as applyStatus, audit_result_name as 'mediResult'


			<select id="pageMyTaskShWSQD" resultType="cn.huge.module.cases.domain.dto.FrontPageListWSQDDTO">
			select t1.*,t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
			concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
			from
			(
			SELECT case_id as caseId, id as ownerId, return_time as turnaroundTime, '回退' as applyType,
			audit_unit_name as auditUnit, return_status as auditStatus, audit_result_name as auditResult,
			audit_time as auditTime, create_time, audit_result
			FROM dyh_case_return
			WHERE return_unit_id = #{terms.applyUnitId}
			union all
			SELECT case_id as caseId, id as ownerId, apply_time as turnaroundTime, '结案' as applyType,
			audit_unit_name as auditUnit, apply_status as auditStatus, audit_result_name as auditResult,
			audit_time as auditTime, create_time, audit_result
			FROM dyh_case_windup_apply
			WHERE apply_unit_id = #{terms.applyUnitId}
			union all
			SELECT case_id as caseId, id as ownerId, appear_time as turnaroundTime, '上报' as applyType,
			audit_unit_name as auditUnit, apply_status as auditStatus, audit_result_name as auditResult,
			audit_time as auditTime, create_time, audit_result
			FROM dyh_case_appear
			WHERE appear_unit_id = #{terms.applyUnitId}
			union all
			SELECT case_id as caseId, id as ownerId, apply_time as turnaroundTime, '联合处置' as applyType,
			audit_unit_name as auditUnit, apply_status as auditStatus, audit_result_name as auditStatus,
			audit_time as auditTime, create_time, audit_result
			FROM dyh_case_assist_apply
			WHERE apply_unit_id = #{terms.applyUnitId}
			)t1 left join dyh_case_info t2 on t1.caseId = t2.id
			<where>
			<if test="terms.applyType != null and terms.applyType !=''">
			and t1.applyType = #{terms.applyType}
			</if>
			<if test="terms.auditStatus != null and terms.auditStatus !=''">
			and t1.audit_result = #{terms.auditResult}
			</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})
			and (DATE_FORMAT(t1.turnaroundTime,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
			and DATE_FORMAT(t1.turnaroundTime,'%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}, '%')
			</if>
			</where>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
			isnull(${s.property}), ${s.property} ${s.direction}