From 2c0b07b09ab772646e973983e4fb6cddbd3664dc Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 24 Sep 2024 17:28:05 +0800
Subject: [PATCH] 督办列表修改新增字段、新增排序 待审核列表修改新增字段、新增排序
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java | 16 ++++++++++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml | 4 +++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml | 4 +++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml | 4 +++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 16 ++++++++--------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 4 +++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 12 +++++++++---
7 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index 956445f..d390c3a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -772,7 +772,7 @@
}
break;
case 2:
- sortName = "t1.case_level";
+ sortName = "t2.case_level";
break;
case 3:
sortName = "superviseCount";
@@ -844,7 +844,7 @@
}else if(2 == sortColmn){
sortName = "t2.case_level";
}else if(3 == sortColmn){
- sortName = "t1.return_status";
+ sortName = "t1.audit_time";
}
break;
case 2:
@@ -853,7 +853,7 @@
}else if(2 == sortColmn){
sortName = "t2.case_level";
}else if(3 == sortColmn){
- sortName = "t1.apply_status";
+ sortName = "t1.audit_time";
}
break;
case 3:
@@ -862,7 +862,7 @@
}else if(2 == sortColmn){
sortName = "t2.case_level";
}else if(3 == sortColmn){
- sortName = "t1.apply_status";
+ sortName = "t1.audit_time";
}
break;
case 4:
@@ -871,7 +871,7 @@
}else if(2 == sortColmn){
sortName = "t2.case_level";
}else if(3 == sortColmn){
- sortName = "t1.apply_status";
+ sortName = "t1.audit_time";
}
break;
default:
@@ -1016,13 +1016,13 @@
sortName = "timeLimit";
break;
case 3:
- sortName = "t1.case_level";
+ sortName = "t2.case_level";
break;
case 4:
- sortName = "t1.case_level";
+ sortName = "t1.sup_status";
break;
default:
- sortName = "t1.sup_status";
+ sortName = "t1.sup_time";
break;
}
switch (sortType){
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
index bc3b99b..b4e01c1 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
@@ -261,6 +261,8 @@
<result property="backUnit" column="backUnit"/>
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核统计 -->
@@ -283,7 +285,7 @@
</select>
<!-- 首页-待审核分页查询 -->
<select id="pageMyTaskAppearReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
+ SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.appear_time as turnaroundTime, t1.appear_unit_name as organizingUnit, t1.appear_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, concat(t2.defendants, t2.dagents) as defendants
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
index d871ffb..459aaa8 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
@@ -267,6 +267,8 @@
<result property="backUnit" column="backUnit"/>
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核统计 -->
@@ -289,7 +291,7 @@
</select>
<!-- 首页-待审核分页查询 -->
<select id="pageMyTaskAssistReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as ownerId, t1.case_id as CaseId,
+ SELECT t1.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.apply_assist_unit_name as cooperatingUnit,
t1.apply_content as reason,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, concat(t2.defendants, t2.dagents) as defendants
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
index c33bc3c..41b1db9 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
@@ -267,6 +267,8 @@
<result property="backUnit" column="backUnit"/>
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核统计 -->
@@ -290,7 +292,7 @@
<!-- 首页-待审核条件统计 -->
<select id="pageMyTaskReturnReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
+ SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.return_time as turnaroundTime, t1.return_unit_name as organizingUnit, t1.return_content as reason,
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, concat(t2.defendants, t2.dagents) as defendants
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..d16e932 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,7 @@
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
<result property="process" column="process"/>
+ <result property="content" column="content"/>
</resultMap>
<!-- 首页督办条件统计 -->
@@ -288,8 +289,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 +307,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.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,
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 b2f6335..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,7 +323,7 @@
</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,
concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType, 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 9065b45..cdfd882 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
@@ -118,4 +118,20 @@
* 审核部门
*/
private String auditDept;
+
+ /**
+ * 办理结果
+ */
+ private String auditResult;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 审核时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date auditTime;
}
--
Gitblit v1.8.0