From 23004281f096c4a195a83be2242ee46d41c4a0ad Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 24 Sep 2024 21:22:13 +0800
Subject: [PATCH] 计算时间修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 cbc95ef..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
@@ -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>
<!-- 首页-待审核条件统计 -->
@@ -321,10 +323,10 @@
</select>
<!-- 首页-待审核分页查询 -->
<select id="listMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
+ 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
@@ -360,9 +362,6 @@
<if test="terms.assistUnitId != null and terms.assistUnitId !=''">
and t3.assist_unit_id like concat('%', #{terms.assistUnitId}, '%')
</if>
- <if test="terms.applyStatus != null and terms.applyStatus !=''">
- and t1.apply_status = #{terms.applyStatus}
- </if>
<if test="terms.auditResult != null and terms.auditResult !=''">
and t1.audit_result = #{terms.auditResult}
</if>
@@ -381,8 +380,10 @@
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
- t2.delete_status = 0
+ t1.apply_status = #{terms.applyStatus}
+ and t2.delete_status = 0
<include refid="mySubmitApplyReview-where-part"/>
</select>
<!-- 首页-结案申请/已结案分页查询 -->
@@ -395,7 +396,7 @@
<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, t2.case_type_name as caseType,
+ 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
@@ -403,7 +404,8 @@
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
- t2.delete_status = 0
+ 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 ">
--
Gitblit v1.8.0