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/vo/FwDeviceScrapVO.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 104 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java
index b2173c0..9a6d0e8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java
@@ -16,20 +16,121 @@
*/
package org.sxkj.fw.device.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.sxkj.system.cache.SysCache;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* 设备报废记录表 视图实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceScrapVO extends FwDeviceScrapEntity {
+public class FwDeviceScrapVO 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 String deviceAtt;
+
+ /**
+ * 设备型号
+ */
+ @ApiModelProperty(value = "设备型号")
+ private String deviceModel;
+
+ /**
+ * 所属部门
+ */
+ @ApiModelProperty(value = "所属部门")
+ private Long belongDept;
+
+ /**
+ * 设备规格
+ */
+ @ApiModelProperty(value = "设备规格")
+ private String deviceSpecification;
+
+ /**
+ * 生产厂商
+ */
+ @ApiModelProperty(value = "生产厂商")
+ private String manufacturer;
+
+ /**
+ * 来源
+ */
+ @ApiModelProperty(value = "来源")
+ private String source;
+
+ /**
+ * 用途
+ */
+ @ApiModelProperty(value = "用途")
+ private String purpose;
+
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String charger;
+
+ @ApiModelProperty("入库时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "所属部门名称")
+ public String getBelongDeptName() {
+ if (belongDept == null) {
+ return null;
+ }
+ return SysCache.getDeptName(belongDept);
+ }
+
}
--
Gitblit v1.9.3