From 3bdabb04e25e91b258704bff5a8276e30a6c9592 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Fri, 26 Sep 2025 09:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAexcel=20=E7=BC=BA=E5=B0=91=E7=BB=91=E5=AE=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8Cexcel=E8=A1=A8=E5=A4=B4=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=8C=89=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/dto/DeviceExcelExportDTO.java         | 16 +++++++++++++---
 .../service/impl/DeviceExportService.java        |  2 ++
 .../mapper/equipment/DeviceAlarmMapper.xml       |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java
index 7388b50e..8a819e90 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelExportDTO.java
@@ -22,9 +22,6 @@ public class DeviceExcelExportDTO {
     // @ExcelProperty("ID")
     // private Long id;
 
-    @ExcelProperty("设备类型")
-    @ColumnWidth(20)
-    private String typeName;
 
     // @ExcelProperty("设备类型")
     // private Long deviceType;
@@ -55,12 +52,25 @@ public class DeviceExcelExportDTO {
     @ColumnWidth(20)
     private String deviceImei;
 
+    @ExcelProperty("设备类型")
+    @ColumnWidth(20)
+    private String typeName;
+
     // @ExcelProperty("经度")
     // private String longitude;
 
     // @ExcelProperty("纬度")
     // private String latitude;
 
+    /**
+     * 绑定状态
+     * 0 未绑定
+     * 1 已绑定
+     */
+    @ExcelProperty("绑定状态")
+    @ColumnWidth(20)
+    private String bindingStatus;
+
     @ExcelProperty("备注")
     @ColumnWidth(30)
     private String remark;
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java
index 4ce31b52..551b8111 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java
@@ -53,7 +53,9 @@ public class DeviceExportService {
                 dto.setTypeName(device.getTypeName());
                 dto.setCreateBy(device.getCreateByName());
                 Integer deviceStatus = device.getDeviceStatus();
+                Integer bindingStatus = device.getBindingStatus();
                 // dto.setDeviceStatus(deviceStatus == 1 ? "正常" : "失效");
+                dto.setBindingStatus(bindingStatus == 1 ? "已绑定" : "未绑定");
                 // 时间戳转换
                 dto.setCreateTime(DateUtils.format(device.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
 
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
index 4e79b654..1fbbf520 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
@@ -29,9 +29,10 @@
                 and da.treatment_state = #{bo.treatmentState}
             </if>
             <if test="bo.queryTime1 != null and  bo.queryTime2 != null ">
-                and da.start_time between #{bo.queryTime1} and #{bo.queryTime2}
+                and da.start_time BETWEEN #{bo.queryTime1} AND #{bo.queryTime2}
             </if>
         </where>
+        order by da.create_time DESC
     </select>