From 4b9dc71d162f3fcd79bc88b170154b7516fc4962 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 18 十二月 2025 13:37:14 +0800
Subject: [PATCH] 新增设备维修保养过程描述,上传对应附件
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 60 ++++++++----------------------------------------------------
1 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index cae0715..1c64da2 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -1,71 +1,27 @@
package com.ruoyi.device.dto;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.device.pojo.DeviceMaintenance;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.time.LocalDateTime;
-import java.util.Date;
+import java.util.List;
@Data
-public class DeviceMaintenanceDto {
-
-
- @ApiModelProperty("璁惧淇濆吇id")
-
- private Long id;
-
- @ApiModelProperty("璁惧鍙拌处id")
- private Long deviceLedgerId;
-
- @ApiModelProperty("璁惧鍚嶇О")
- private String deviceName;
-
- @ApiModelProperty("瑙勬牸鍨嬪彿")
- private String deviceModel;
+public class DeviceMaintenanceDto extends DeviceMaintenance {
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
private String maintenancePlanTimeReq;
-
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private LocalDateTime maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private LocalDateTime maintenanceActuallyTime;
-
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
private String maintenanceActuallyTimeReq;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
- private Integer maintenanceResult;
+ @ApiModelProperty("淇濆吇杩涘害鎻忚堪")
+ private String maintenanceProcessDesc;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
- private Integer status;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty("鍒涘缓浜�")
- @TableField(fill = FieldFill.INSERT)
- private String createUser;
-
- @ApiModelProperty("鏇存柊浜�")
- @TableField(fill = FieldFill.UPDATE)
- private String updateUser;
-
- @ApiModelProperty("绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
- @ApiModelProperty("鍒涘缓浜哄悕绉�")
- private String createUserName;
+ @ApiModelProperty("璁惧鍥剧墖")
+ private List<StorageBlobDTO> files;
}
--
Gitblit v1.9.3