忽略行驶表导出修改

business-service/src/main/java/com/ozs/entity/TerminalIgnoreAlarm.java

@@ -1,10 +1,13 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
@@ -39,16 +42,27 @@ public class TerminalIgnoreAlarm extends BaseEntity implements Serializable {
     /**
      * 终端编码
      */
+    @Excel(name = "终端编码")
     private String terminalCode;
 
+    /**
+     * 终端名称
+     */
+    @Excel(name = "终端名称")
+    @TableField(exist = false)
+    private String terminalName;
+
     /**
      * 报警唯一标识UUID
      */
+    @Excel(name = "报警唯一标识")
     private String alarmId;
 
     /**
      * 忽略时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "忽略时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date ignoreTime;
 
     /**
@@ -74,7 +88,6 @@ public class TerminalIgnoreAlarm extends BaseEntity implements Serializable {
     /**
      * 备注
      */
+    @Excel(name = "备注")
     private String remark;
-
-
 }

business-service/src/main/resources/mapper/TerminalIgnoreAlarmMapper.xml

@@ -4,6 +4,7 @@
     <resultMap id="TerminalIgnoreAlarmResult" type="com.ozs.entity.TerminalIgnoreAlarm">
         <id column="id" property="id"/>
         <result column="terminal_code" property="terminalCode"/>
+        <result column="terminal_name" property="terminalName"/>
         <result column="alarm_id" property="alarmId"/>
         <result column="ignore_time" property="ignoreTime"/>
         <result column="create_by" property="createBy"/>
@@ -15,6 +16,7 @@
     <select id="list" resultMap="TerminalIgnoreAlarmResult" >
         SELECT
         a.terminal_code,
+        b.terminal_name,
         a.alarm_id,
         a.ignore_time,
         a.create_by,
@@ -22,11 +24,11 @@
         a.update_by,
         a.update_time,
         a.remark
-        FROM terminal_ignore_alarm as a
-
+        FROM terminal_ignore_alarm as a inner join
+        base_vehicle_terminal as b on a.terminal_code = b.terminal_code
         <where>
             <if test="terminalCode != null and terminalCode != ''">
-                and a.terminalCode = #{terminalCode}
+                and a.terminal_code = #{terminalCode}
             </if>
         </where>
     </select>