From 08bae4808c1cc00ab4ef1bf5254b3d712228be4d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 12 Oct 2024 09:27:10 +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/CaseSuperviseMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 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 d16e932..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
@@ -279,6 +279,8 @@
<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>
<!-- 首页督办条件统计 -->
@@ -307,7 +309,7 @@
<!-- 首页督办分页查询 -->
<select id="pageMyTaskDb" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as ownerId, t1.case_id as caseId, t1.reply_content as content, t1.sup_status as applyStatus,
+ 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