From b0c79c75b9320fcda4189eb2269796649204f3f3 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 21:40:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java | 5 +++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 5 +++--
2 files changed, 8 insertions(+), 2 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..ba539ff 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,7 +370,7 @@
</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,
concat(t2.plaintiffs, t2.pagents) as plaintiffs,
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
index e3fc8c3..41803ac 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
@@ -10,6 +10,11 @@
/**
* 所属编号
*/
+ private String windupId;
+
+ /**
+ * 所属编号
+ */
private String ownerId;
/**
--
Gitblit v1.8.0