From 3de63514e769ac64da604a3e7e3262b33e653884 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 16 六月 2025 13:55:29 +0800
Subject: [PATCH] feat(eims): 新增修改密码功能并优化用户初始密码设置- 在 SocialAuthStrategy 中使用 BCrypt 对用户初始密码进行加密- 在 eims-ui-mobile 中添加修改密码页面和相关功能 - 更新用户服务以支持修改密码操作 - 调整页面路由以包含新功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintOrderBo.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintOrderBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintOrderBo.java
index e90b9dd..af48846 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintOrderBo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintOrderBo.java
@@ -9,7 +9,10 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.eims.domain.EimsSpareInout;
/**
* 淇濆吇宸ュ崟涓氬姟瀵硅薄 eims_maint_order
@@ -31,7 +34,6 @@
/**
*
*/
- @NotNull(message = "璁惧id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private Long equId;
/**
@@ -57,7 +59,6 @@
/**
* 璁″垝琛ㄥ啑浣�-淇濆吇浜�
*/
- @NotNull(message = "璁″垝琛ㄥ啑浣�-淇濆吇浜轰笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long maintUser;
/**
@@ -68,25 +69,31 @@
/**
* 璁″垝琛ㄥ啑浣�-淇濆吇閮ㄩ棬
*/
- @NotNull(message = "璁″垝琛ㄥ啑浣�-淇濆吇閮ㄩ棬涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private Long maintDept;
/**
* 淇濆吇鍗曞彿
*/
- @NotBlank(message = "淇濆吇鍗曞彿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String maintCode;
+
+ /**
+ * 淇濆吇椤�
+ */
+ private String maintName;
+
+ /**
+ * 宸ヤ綔鎻忚堪
+ */
+ private String maintDesc;
/**
*
*/
- @NotBlank(message = "鐘舵�佷笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private String status;
/**
* 淇濆吇璁″垝鏃堕棿
*/
- @NotNull(message = "淇濆吇璁″垝鏃堕棿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planTime;
@@ -110,9 +117,23 @@
*/
private String remark;
+ /**
+ * 淇濆吇鏂瑰紡锛�0-妫�鏌ワ紝1-淇濆吇锛�2-缁翠慨锛�
+ */
+ private String maintFun;
+
+ /**
+ * 缁翠慨璇存槑
+ */
+ private String repairDesc;
// 鍏宠仈琛ㄥ瓧娈�
private String equName;
+ private String maintUserName;
+
+ private List<EimsSpareBo> spareParts;
+
+ private String picture;
}
--
Gitblit v1.9.3