From 089964a497c2528e88ddc610af5f88f631303431 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 15:28:16 +0800
Subject: [PATCH] feat: 设备保养新增任务状态，启动/停止与调度器关联
---
src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 958db15..251f9d6 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -1,8 +1,6 @@
package com.ruoyi.device.execl;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,12 +20,16 @@
private String deviceModel;
@ApiModelProperty("鎶ヤ慨鏃堕棿")
- @Excel(name = "鎶ヤ慨鏃堕棿")
+ @Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date repairTime;
@ApiModelProperty("鎶ヤ慨浜�")
@Excel(name = "鎶ヤ慨浜�")
private String repairName;
+
+ @ApiModelProperty("楠屾敹浜�")
+ @Excel(name = "楠屾敹浜�")
+ private String acceptanceName;
@ApiModelProperty("鎶ヤ慨鍐呭")
@Excel(name = "鎶ヤ慨鍐呭")
@@ -38,8 +40,8 @@
private String maintenanceName;
@ApiModelProperty("缁翠慨鏃堕棿")
- @Excel(name = "缁翠慨鏃堕棿")
- private Date maintenanceTime;
+ @Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDateTime maintenanceTime;
@ApiModelProperty("缁翠慨缁撴灉")
@Excel(name = "缁翠慨缁撴灉")
@@ -50,10 +52,10 @@
private String statusStr;
@ApiModelProperty("鍒涘缓鏃堕棿")
- @Excel(name = "褰曞叆鏃堕棿")
+ @Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime createTime;
- @Excel(name = "褰曞叆浜�")
+// @Excel(name = "褰曞叆浜�")
@ApiModelProperty("鍒涘缓浜�")
private String createUser;
--
Gitblit v1.9.3