From 00e04baf00ac8f35ca4483791bf17526b050ff44 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 24 Sep 2024 19:48:30 +0800
Subject: [PATCH] 督办添加审核时间字段、排序
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
index 810086d..25b641f 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
@@ -278,6 +278,9 @@
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
<result property="process" column="process"/>
+ <result property="content" column="content"/>
+ <result property="applyStatus" column="applyStatus"/>
+ <result property="replyTime" column="replyTime"/>
</resultMap>
<!-- 首页督办条件统计 -->
@@ -288,8 +291,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.type != 3">
+ and t1.quilt_unit_id = #{terms.quiltUnitId}
+ and t1.sup_status = #{terms.supStatus}
+ </if>
+ <if test="terms.type == 3">
+ 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})
@@ -301,7 +309,7 @@
<!-- 首页督办分页查询 -->
<select id="pageMyTaskDb" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as ownerId, t1.case_id as caseId,
+ SELECT t1.id as ownerId, t1.case_id as caseId, t1.reply_content as content, t1.sup_status as applyStatus, t1.reply_time as replyTime,
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,
concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
--
Gitblit v1.8.0