From e38e221787a33c7d6454892f651508bf372761ca Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Wed, 21 Jun 2023 13:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/excel/AppealExcel.java   | 51 +++++++++----------
 .../modules/business/mapper/AppealMapper.xml  |  9 +++-
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/excel/AppealExcel.java b/src/main/java/org/springblade/modules/business/excel/AppealExcel.java
index d56e976..471f55e 100644
--- a/src/main/java/org/springblade/modules/business/excel/AppealExcel.java
+++ b/src/main/java/org/springblade/modules/business/excel/AppealExcel.java
@@ -13,42 +13,41 @@ import java.io.Serializable;
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class AppealExcel implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    @ExcelProperty("矛盾纠纷类型")
-    private String disputeName;
+	@ExcelProperty("矛盾纠纷类型")
+	private String disputeName;
 
-    @ExcelProperty("上报人")
-    private String username;
+	@ExcelProperty("上报人")
+	private String username;
 
-    @ExcelProperty("上报时间")
-    private String firstRegTime;
+	@ExcelProperty("上报时间")
+	private String firstRegTime;
 
-    @ExcelProperty("事件来源")
-    private String sjly;
+	@ExcelProperty("事件来源")
+	private String sjly;
 
-    @ExcelProperty("事件等级")
-    private String disputeLevel;
+	@ExcelProperty("事件等级")
+	private String disputeLevel;
 
-    @ExcelProperty("所属镇街")
-    private String streetId;
+	@ExcelProperty("所属镇街")
+	private String streetId;
 
-    @ExcelProperty("地点")
-    private String dd;
+	@ExcelProperty("地点")
+	private String dd;
 
-    @ExcelProperty("坐标")
-    private String zb;
+	@ExcelProperty("坐标")
+	private String zb;
 
-    @ExcelProperty("矛盾 纠纷详情")
-    private String problemDesc;
+	@ExcelProperty("矛盾 纠纷详情")
+	private String problemDesc;
 
-    @ExcelProperty("状态")
-    private String status;
+	@ExcelProperty("状态")
+	private String status;
 
-    @ExcelProperty("调解员")
-    private String tjy;
-
-    @ExcelProperty("所属部门")
-    private String handleDept;
+	@ExcelProperty("调解员")
+	private String mediatorName;
 
+	@ExcelProperty("所属部门")
+	private String handleDept;
 }
diff --git a/src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml
index cbfbf25..7b0773e 100644
--- a/src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml
+++ b/src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml
@@ -7,14 +7,19 @@
             CASE a.dispute_level WHEN 0 THEN '简单' WHEN 1 THEN '一般' WHEN 2 THEN '重大' WHEN 3 THEN '疑难' ELSE '' END disputeLevel,
             if(a.street_id IS NULL, '', biz.dict_value) AS streetId, a.problem_desc AS problemDesc,
             CASE a.status WHEN 0 THEN '待处理' WHEN 1 THEN '正在处理' WHEN 2 THEN '达成协议' WHEN 3 THEN '调解成功' ELSE '' END `status`,
-            if(a.handle_dept IS NULL, '', u.name) AS handleDept
+            if(a.handle_dept IS NULL, '', u.name) AS handleDept, mediation.mediatorName
         FROM mp_appeal a
         LEFT JOIN (
             SELECT appeal_id, GROUP_CONCAT(username) username
             FROM (SELECT DISTINCT vistor.appeal_id, vistor.username FROM mp_appeal_visitor vistor) t
             GROUP BY appeal_id
         ) vistor ON a.id = vistor.appeal_id
-        LEFT JOIN blade_dict_biz biz ON a.dispute_id = biz.id
+        LEFT JOIN (
+            SELECT appeal_id, GROUP_CONCAT(mediator_name) mediatorName
+            FROM (SELECT DISTINCT mediation.appeal_id, mediation.mediator_name FROM mp_appeal_mediation mediation) t
+            GROUP BY appeal_id
+        ) mediation ON a.id = mediation.appeal_id
+        LEFT JOIN blade_dict_biz biz ON a.street_id = biz.id
         LEFT JOIN blade_user u ON a.handle_dept = u.id
         WHERE a.source_type = 0
         <if test="appealStatus != null and appealStatus != ''">