From b66309d6133fe992a1e88f2b8d8cdd3f36f974e1 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 8 Apr 2024 09:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BC=E5=85=A5=EF=BC=8C=E5=91=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/incoming/incoming.html   |  2 +-
 .../templates/system/outbound/outbound.html   |  2 +-
 .../system/domain/FsChannelRecordVo.java      | 19 -------------------
 .../mapper/system/FsChannelRecordMapper.xml   |  7 ++-----
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html b/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html
index 84d2eb5..4bb35b8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html
+++ b/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html
@@ -64,7 +64,7 @@
 					title : '坐席账号'
 				},
 				{
-					field : 'code',
+					field : 'department',
 					title : '所属部门'
 				},
 				{
diff --git a/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html b/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html
index a0bfaf4..fd41cac 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html
@@ -64,7 +64,7 @@
 					title : '坐席账号'
 				},
 				{
-					field : 'code',
+					field : 'department',
 					title : '所属部门'
 				},
 				{
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java
index b2acc12..5a4104f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java
@@ -258,32 +258,13 @@ public class FsChannelRecordVo implements Serializable {
      */
     private String shopaddress;
 
-    /**
-     * 附件
-     */
-    private String enclosure;
 
     /**
      * 处理提交时间
      */
     private Date dealtime;
 
-    /**
-     * 联动1
-     */
-    private String linkage11;
-
 
-    /**
-     * 联动2
-     */
-    private String linkage12;
-
-
-    /**
-     * 复选框
-     */
-    private String checkbox1;
 
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
index 87914de..90e77a2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
@@ -81,6 +81,7 @@
         a.aj AS aj,
         a.is_lost AS is_lost,
         a.code AS code,
+        (SELECT t.department FROM external_department t where t.code=a.code) as department,
         a.pid AS pid,
         a.ring_time AS ring_time,
         a.list_in AS list_in,
@@ -107,11 +108,7 @@
         b.office AS office,
         b.shopname AS shopname,
         b.shopaddress AS shopaddress,
-        b.enclosure AS enclosure,
-        b.dealtime AS dealtime,
-        b.linkage11 AS linkage11,
-        b.linkage12 AS linkage12,
-        b.checkbox1 AS checkbox1 from fs_channel_record a
+        b.dealtime AS dealtime from fs_channel_record a
         LEFT JOIN fs_remark_record b ON a.uuid = b.uuid
         <where>
             <if test="channelType != null">