From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java
index 3c658ae..02a1d82 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java
@@ -17,20 +17,21 @@
package org.sxkj.fw.device.excel;
-import lombok.Data;
-
-import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 设备表 Excel实体类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Data
@@ -83,6 +84,30 @@
@ColumnWidth(20)
@ExcelProperty("来源")
private String source;
+ /**
+ * 用途
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("用途")
+ private String purpose;
+ /**
+ * 所属部门
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("所属部门")
+ private Long belongDept;
+ /**
+ * 负责人
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("负责人")
+ private String charger;
+ /**
+ * 联系电话
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("联系电话")
+ private String contactPhone;
/**
* 备注
*/
@@ -138,4 +163,18 @@
@ExcelProperty("删除标志（0存在 1删除）")
private Byte isDeleted;
+ /**
+ * 使用日期
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("使用日期")
+ private Date useDate;
+
+ /**
+ * 使用年限（单位：年）
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("使用年限（单位：年）")
+ private Integer serviceLife;
+
}
--
Gitblit v1.9.3