From f01fba235d070d174609f4f66642368b1df1ab03 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 04 六月 2026 15:37:06 +0800
Subject: [PATCH] 销售台账新增后，对应的生产订单生产后，删除销售台账，此生产工单还存在
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index c101bc0..a9c8c10 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,13 +3,19 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date;
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class DeviceRepairDto {
@ApiModelProperty("璁惧鎶ヤ慨id")
@@ -24,8 +30,15 @@
@ApiModelProperty("璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
+ @ApiModelProperty("鎶ヤ慨鏃堕棿寮�濮�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeStart;
+
+ @ApiModelProperty("鎶ヤ慨鏃堕棿缁撴潫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeEnd;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
@@ -33,12 +46,17 @@
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
+ @ApiModelProperty("鎶ヤ慨椤圭洰")
+ private String repairProject;
+
@ApiModelProperty("缁翠慨浜�")
private String maintenanceName;
@ApiModelProperty("缁翠慨鏃堕棿")
private Date maintenanceTime;
+ private String maintenanceTimeStr;
+
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
--
Gitblit v1.9.3