~huangh/gz-dyh.git

			@@ -363,9 +363,9 @@
			<!-- 查询任务数量 -->
			<select id="countTaskList" resultMap="FrontPageCountResult">
			select
			count(case when (node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP') and sign_status != 1 then id end) as waitDisp,
			count(case when (node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP' or node_id = 'DFP') and sign_status != 1 then id end) as waitDisp,
			count(case when sign_status = 1 then id end) as waitSign,
			count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL') and sign_status != 1 then id end) as waitAccept,
			count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL' or node_id = 'DSL') and sign_status != 1 then id end) as waitAccept,
			count(case when node_id = 'BLFK' then id end) as Processing
			from
			<include refid="table-name" />
			@@ -398,46 +398,56 @@
			<result property="process" column="process"/>
			</resultMap>

			<!-- 首页-待分派条件统计 -->

			<!-- 工作台-待/已分派条件查询-条件 -->
			<sql id="myTaskFp-where-part">
			<if test="terms != null">
			<if test="terms.candeUnitId != null and terms.candeUnitId !=''">
			and t1.cande_unit_id = #{terms.candeUnitId}
			</if>
			<if test="terms.status != null and terms.status !=''">
			and t1.status = #{terms.status}
			</if>
			<if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
			and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
			and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
			</if>
			<if test="terms.handleTimeStart != null and terms.handleTimeStart !='' and terms.handleTimeEnd != null and terms.handleTimeEnd !=''">
			and (DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.handleTimeStart}
			and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
			</if>
			<if test="terms.partyName != null and terms.partyName !=''">
			and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
			</if>
			</if>
			</sql>
			<!-- 工作台-待/已分派条件统计 -->
			<select id="countMyTaskFp" resultType="java.lang.Long">
			select
			COUNT(t1.id)
			from
			dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
			where
			cande_unit_id = #{terms.candeUnitId}
			and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP')
			(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.delete_status = 0
			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>
			and t2.delete_status = 0
			<include refid="myTaskFp-where-part"/>
			</select>
			<!-- 首页-待分派分页查询 -->
			<select id="pageMyTaskFp" resultMap="MyTaskApplyReviewResult">
			<!-- 工作台-待分派分页查询 -->
			<select id="pageMyTaskFp" resultType="cn.huge.module.cases.domain.dto.FrontPageListFPDTO">
			SELECT t1.id as ownerId, t1.case_id as caseId,
			t1.create_time as turnaroundTime, t1.expire_time as timeLimit, 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
			t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t1.handle_time as taskHandleTime,
			t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
			concat(t2.que_area_name, t2.que_road_name) as queAddress,
			concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
			(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
			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_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP')
			(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.delete_status = 0
			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>
			and t2.delete_status = 0
			<include refid="myTaskFp-where-part"/>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
			isnull(${s.property}), ${s.property} ${s.direction}
			@@ -449,45 +459,53 @@
			limit #{page.offset}, #{page.size}
			</select>

			<!-- 首页-待签收条件统计 -->

			<!-- 工作台-待/已签收条件查询-条件 -->
			<sql id="myTaskQs-where-part">
			<if test="terms != null">
			<if test="terms.candeUnitId != null and terms.candeUnitId !=''">
			and t1.cande_unit_id = #{terms.candeUnitId}
			</if>
			<if test="terms.signStatus != null and terms.signStatus !=''">
			and t1.sign_status = #{terms.signStatus}
			</if>
			<if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
			and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
			and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
			</if>
			<if test="terms.signTimeStart != null and terms.signTimeStart !='' and terms.signTimeEnd != null and terms.signTimeEnd !=''">
			and (DATE_FORMAT(t1.sign_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.signTimeStart}
			and DATE_FORMAT(t1.sign_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.signTimeEnd})
			</if>
			<if test="terms.partyName != null and terms.partyName !=''">
			and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
			</if>
			</if>
			</sql>
			<!-- 首页-待/已签收条件统计 -->
			<select id="countMyTaskQs" resultType="java.lang.Long">
			select
			COUNT(t1.id)
			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.sign_status = #{terms.signStatus}
			and t1.delete_status = 0
			t2.delete_status = 0
			and t1.status = '1'
			<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>
			<include refid="myTaskQs-where-part"/>
			</select>
			<!-- 首页-待签收分页查询 -->
			<select id="pageMyTaskQs" resultMap="MyTaskApplyReviewResult">
			<!-- 首页-待/已签收分页查询 -->
			<select id="pageMyTaskQs" resultType="cn.huge.module.cases.domain.dto.FrontPageListQSDTO">
			SELECT t1.id as ownerId, t1.case_id as caseId,
			t1.create_time as turnaroundTime, t1.expire_time as timeLimit, 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
			t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.sign_time as taskHandleTime,
			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,
			(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
			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.sign_status = #{terms.signStatus}
			and t1.delete_status = 0
			t2.delete_status = 0
			and t1.status = '1'
			<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>
			<include refid="myTaskQs-where-part"/>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
			isnull(${s.property}), ${s.property} ${s.direction}
			@@ -499,48 +517,58 @@
			limit #{page.offset}, #{page.size}
			</select>

			<!-- 首页-待受理条件统计 -->

			<!-- 工作台-待/已受理条件查询-条件 -->
			<sql id="myTaskSl-where-part">
			<if test="terms != null">
			<if test="terms.candeUnitId != null and terms.candeUnitId !=''">
			and t1.cande_unit_id = #{terms.candeUnitId}
			</if>
			<if test="terms.status != null and terms.status !=''">
			and t1.status = #{terms.status}
			</if>
			<if test="terms.caseTaskType != null and terms.caseTaskType !=''">
			and t1.case_task_type = #{terms.caseTaskType}
			</if>
			<if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
			and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
			and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
			</if>
			<if test="terms.handleTimeStart != null and terms.handleTimeStart !='' and terms.handleTimeEnd != null and terms.handleTimeEnd !=''">
			and (DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.handleTimeStart}
			and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
			</if>
			<if test="terms.partyName != null and terms.partyName !=''">
			and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
			</if>
			</if>
			</sql>
			<!-- 首页-待/已受理条件统计 -->
			<select id="countMyTaskSl" resultType="java.lang.Long">
			select
			COUNT(t1.id)
			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')
			and t1.delete_status = 0
			(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>
			<include refid="myTaskSl-where-part"/>
			</select>
			<!-- 首页-待受理分页查询 -->
			<select id="pageMyTaskSl" resultMap="MyTaskApplyReviewResult">
			<!-- 首页-待/已受理分页查询 -->
			<select id="pageMyTaskSl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
			SELECT t1.id as ownerId, t1.case_id as caseId,
			t1.create_time as turnaroundTime, t1.expire_time as timeLimit,
			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
			t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.handle_time as taskHandleTime,
			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,
			(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
			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')
			and t1.delete_status = 0
			(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>
			<include refid="myTaskSl-where-part"/>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
			isnull(${s.property}), ${s.property} ${s.direction}
			@@ -561,7 +589,7 @@
			where
			t1.cande_unit_id = #{terms.candeUnitId}
			and t1.node_id = 'BLFK'
			and t1.delete_status = 0
			and t2.delete_status = 0
			and t1.status = 1
			<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}
			@@ -582,7 +610,7 @@
			where
			t1.cande_unit_id = #{terms.candeUnitId}
			and t1.node_id = 'BLFK'
			and t1.delete_status = 0
			and t2.delete_status = 0
			and t1.status = 1
			<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}
			@@ -602,6 +630,48 @@
			limit #{page.offset}, #{page.size}
			</select>

			<!-- 首页-待审核-我申请的条件统计 -->
			<select id="countMyTaskShWSQD" resultType="java.lang.Long">
			select
			COUNT(t1.id)
			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>
			<!-- 首页-待审核-我申请的分页查询 -->
			<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'


			<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>
			<if test="page.sort != null">
			<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
			isnull(${s.property}), ${s.property} ${s.direction}
			</foreach>
			</if>
			<if test="page.sort == null">
			order by isnull(t1.create_time), t1.create_time desc
			</if>
			limit #{page.offset}, #{page.size}
			</select>

			</mapper>