From 46d143d1d6fe8f286399f4d027c9a86adf7cd7fc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 09 七月 2025 08:50:01 +0800
Subject: [PATCH] feat(inspection,maintenance): - 实现保养工单批量确认功能 - 在点检记录确认时增加时间限制，距离上次更新时间两小时内不允许确认
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java
index f59e6cf..287ef5c 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java
@@ -79,13 +79,13 @@
/**
* 淇濆吇浜�
*/
- @NotNull(message = "淇濆吇浜轰笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+// @NotNull(message = "淇濆吇浜轰笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long maintUser;
/**
* 淇濆吇閮ㄩ棬
*/
- @NotNull(message = "淇濆吇閮ㄩ棬涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+// @NotNull(message = "淇濆吇閮ㄩ棬涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private Long maintDept;
/**
@@ -97,19 +97,21 @@
/**
* 棣栨鎵ц鏃堕棿
*/
- @NotNull(message = "淇濆吇璁″垝棣栨鎵ц鏃堕棿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+
@JsonFormat(pattern = "yyyy-MM-dd")
private Date maintFirstTime;
/**
* 涓婃鎵ц鏃堕棿
*/
+
@JsonFormat(pattern = "yyyy-MM-dd")
private Date maintLastTime;
/**
* 涓嬫鎵ц鏃堕棿
*/
+ @NotNull(message = "涓嬫淇濆吇鏃堕棿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
private Date maintNextTime;
@@ -122,7 +124,7 @@
* 涓婃鐢熸垚宸ュ崟鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date lastGenerateDate;
+ private Date lastOrderDate;
// 鍏宠仈琛ㄥ瓧娈�
private String equName;
--
Gitblit v1.9.3