From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
index b71f0b0..e9c32db 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
@@ -16,19 +16,58 @@
  */
 package org.sxkj.fw.device.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import org.sxkj.common.constant.CommonConstant;
 import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 设备报废记录表 数据传输对象实体类
  *
  * @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceScrapDTO extends FwDeviceScrapEntity {
+public class FwDeviceScrapDTO implements Serializable {
+
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "主键")
+	private	Long id;
+
+	/**
+	 * 设备ID(关联ja_fw_device.id)
+	 */
+	@ApiModelProperty(value = "设备ID")
+	private Long deviceId;
+	/**
+	 * 报废时间
+	 */
+	@ApiModelProperty(value = "报废时间")
+	private Date scrapTime;
+	/**
+	 * 报废原因
+	 */
+	@ApiModelProperty(value = "报废原因")
+	private String scrapReason;
+	/**
+	 * 处置方式
+	 */
+	@ApiModelProperty(value = "处置方式")
+	private String disposeWay;
+
+	// 查询使用
+	@ApiModelProperty(value = "设备名称")
+	private String deviceName;
+	@ApiModelProperty(value = "设备类型")
+	private String deviceType;
+	@ApiModelProperty(value = "所属部门")
+	private Long belongDept;
+
 }

--
Gitblit v1.9.3