From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 58 insertions(+), 39 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
index e996c99..3038f5f 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -34,7 +34,7 @@
<result property="auditTime" column="audit_time"/>
<result property="auditResult" column="audit_result"/>
<result property="auditResultName" column="audit_result_name"/>
- <result property="audit_content" column="audit__content"/>
+ <result property="auditContent" column="audit_content"/>
<result property="deleteStatus" column="delete_status"/>
<result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
@@ -67,7 +67,7 @@
audit_time,
audit_result,
audit_result_name,
- audit__content,
+ audit_content,
delete_status,
cust_id,
create_time,
@@ -97,7 +97,7 @@
<if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if>
<if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if>
<if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if>
- <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if>
+ <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if>
<if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
<if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
@@ -176,8 +176,8 @@
<if test="terms.auditResultName != null and terms.auditResultName !=''">
and audit_result_name = #{terms.auditResultName}
</if>
- <if test="terms.audit_content != null and terms.audit_content !=''">
- and audit__content = #{terms.audit_content}
+ <if test="terms.auditContent != null and terms.auditContent !=''">
+ and audit_content = #{terms.auditContent}
</if>
<if test="terms.deleteStatus = null and terms.deleteStatus =''">
and delete_status = 0
@@ -299,6 +299,8 @@
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
<result property="process" column="process"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核条件统计 -->
@@ -316,15 +318,15 @@
and DATE_FORMAT(t1.apply_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(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待审核分页查询 -->
- <select id="pageMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
+ <select id="listMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
+ SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,
t1.fail_reason as reason, 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.case_type_first_name, '/' ,t2.case_type_name) as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
concat(t2.defendants, t2.dagents) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -337,7 +339,7 @@
and DATE_FORMAT(t1.apply_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(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 ">
@@ -350,44 +352,61 @@
limit #{page.offset}, #{page.size}
</select>
- <!-- 首页-结案申请条件统计 -->
- <select id="countMySubmitApplyReview" resultType="java.lang.Long">
+
+ <!-- 工作台-办理中条件查询-条件 -->
+ <sql id="mySubmitApplyReview-where-part">
+ <if test="terms != null">
+ <if test="terms.applyUnitId != null and terms.applyUnitId !=''">
+ and t1.apply_unit_id = #{terms.applyUnitId}
+ </if>
+ <if test="terms.assistUnitId != null and terms.assistUnitId !=''">
+ and t3.assist_unit_id like concat('%', #{terms.assistUnitId}, '%')
+ </if>
+ <if test="terms.auditResult != null and terms.auditResult !=''">
+ and t1.audit_result = #{terms.auditResult}
+ </if>
+ <if test="terms.applyTimeStart != null and terms.applyTimeStart !='' and terms.applyTimeEnd != null and terms.applyTimeEnd !=''">
+ and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.applyTimeStart}
+ and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.applyTimeEnd})
+ </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="countMyTaskJa" resultType="java.lang.Long">
select
COUNT(t1.id)
from
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ left join dyh_case_info_unfold t3 on t3.id = t2.id
where
- t1.delete_status = 0
- and t1.apply_status = #{terms.applyStatus}
- and t1.apply_unit_id = #{terms.applyUnitId}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.apply_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>
+ t1.apply_status = #{terms.applyStatus}
+ and t2.delete_status = 0
+ <include refid="mySubmitApplyReview-where-part"/>
</select>
- <!-- 首页-结案申请分页查询 -->
- <select id="pageMySubmitApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t2.process_name as process,
- t1.apply_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
- t1.medi_result_name as mediResult,t1.fail_reason as reason,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ <!-- 首页-结案申请/已结案分页查询 -->
+ <select id="listMyTaskJa" resultType="cn.huge.module.cases.domain.dto.FrontPageListJADTO">
+ SELECT
+ t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
+ <if test="terms.applyStatus == 0">
+ t1.apply_time as turnaroundTime,
+ </if>
+ <if test="terms.applyStatus == 1">
+ t1.audit_time as turnaroundTime,
+ </if>
+ t1.audit_unit_name as auditUnit, t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
+ t3.mediator as manager, t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
+ t1.medi_result as mediResult, t1.medi_result_name as mediResultName, t2.status_name as caseStatusName,
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ left join dyh_case_info_unfold t3 on t3.id = t2.id
where
- t1.delete_status = 0
- and t1.apply_status = #{terms.applyStatus}
- and t1.apply_unit_id = #{terms.applyUnitId}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.apply_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>
+ t1.apply_status = #{terms.applyStatus}
+ and t2.delete_status = 0
+ <include refid="mySubmitApplyReview-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}
--
Gitblit v1.8.0