From 7b9c994a8678e0aaf86638d7426f183ad7a175a5 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 07 八月 2025 10:03:15 +0800
Subject: [PATCH] yys 修改bug 1.“待审核”状态不能进行筛选 2.不能凭供应商名称/合同号进行筛选 3.不能凭供应商名称进行筛选
---
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 431188d..f5d5463 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -20,16 +20,25 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
+
+
+ private String deviceName;
+
+ private String deviceModel;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private Date maintenancePlanTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private Date maintenanceActuallyTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintenanceActuallyTime;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private Integer maintenanceResult;
--
Gitblit v1.9.3