呼入，呼出列表提交

ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html

@@ -64,7 +64,7 @@
 					title : '坐席账号'
 				},
 				{
-					field : 'code',
+					field : 'department',
 					title : '所属部门'
 				},
 				{

ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html

@@ -64,7 +64,7 @@
 					title : '坐席账号'
 				},
 				{
-					field : 'code',
+					field : 'department',
 					title : '所属部门'
 				},
 				{

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;
 
 
 

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">