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/vo/FwDeviceMaintainPlanVO.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
index f4fbb3f..74a8e8f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
@@ -16,13 +16,16 @@
*/
package org.sxkj.fw.device.vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.sxkj.system.cache.SysCache;
-
-import java.io.Serializable;
import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.sxkj.system.cache.SysCache;
+import java.io.Serializable;
import java.util.List;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备维护计划表 视图实体类
@@ -36,6 +39,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -118,11 +122,17 @@
@ApiModelProperty("入库时间")
private Date createTime;
- @ApiModelProperty(value = "维修状态")
- private String maintainStatus;
+ @ApiModelProperty(value = "维护状态（0未维修1已维修）")
+ private Integer maintainStatus;
@ApiModelProperty(value = "最后维修时间")
- private String lastMaintainTime;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastMaintainTime;
@ApiModelProperty(value = "所属部门名称")
public String getBelongDeptName() {
@@ -132,4 +142,29 @@
return SysCache.getDeptName(belongDept);
}
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
}
--
Gitblit v1.9.3