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/execl/DeviceRepairExeclDto.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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..694b1d6 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,7 +20,7 @@
private String deviceModel;
@ApiModelProperty("鎶ヤ慨鏃堕棿")
- @Excel(name = "鎶ヤ慨鏃堕棿")
+ @Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date repairTime;
@ApiModelProperty("鎶ヤ慨浜�")
@@ -38,7 +36,7 @@
private String maintenanceName;
@ApiModelProperty("缁翠慨鏃堕棿")
- @Excel(name = "缁翠慨鏃堕棿")
+ @Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date maintenanceTime;
@ApiModelProperty("缁翠慨缁撴灉")
@@ -50,10 +48,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