From cb54981736771e19e6b954d8cb60f77576671fc5 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Wed, 11 Sep 2024 13:31:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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 4ebcae5..e996c99 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
@@ -279,6 +279,7 @@
<!-- 首页-待审核结果集 -->
<resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
+ <result property="windupId" column="windupId"/>
<result property="ownerId" column="ownerId"/>
<result property="caseId" column="caseId"/>
<result property="turnaroundTime" column="turnaroundTime"/>
@@ -320,7 +321,7 @@
</select>
<!-- 首页-待审核分页查询 -->
<select id="pageMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT 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.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,
@@ -369,9 +370,9 @@
</select>
<!-- 首页-结案申请分页查询 -->
<select id="pageMySubmitApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t2.process_name as process,
+ 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.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,t1.fail_reason as reason,
+ 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
FROM
--
Gitblit v1.8.0