From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id，维修价格字段，重整状态对应值。优化添加设备报修接口，同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index 2714544..cb6dd6c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -6,14 +6,12 @@
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
public class DeviceMaintenanceDto {
@ApiModelProperty("璁惧淇濆吇id")
-
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
@@ -26,6 +24,9 @@
private String deviceModel;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ private String maintenancePlanTimeReq;
+
+ @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
private LocalDateTime maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
@@ -34,10 +35,13 @@
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
private LocalDateTime maintenanceActuallyTime;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
- private Integer maintenanceResult;
+ @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ private String maintenanceActuallyTimeReq;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ private String maintenanceResult;
+
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
--
Gitblit v1.9.3