From 665a719ed52d49422bd4eb145a44dd6810b92565 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 16 四月 2025 09:35:42 +0800
Subject: [PATCH] art: 设备管理-周保-bug问题处理
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 45001fb..260f414 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -98,6 +98,7 @@
private Date confirmTime;
/** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
@ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
private String confirmDealType;
/**淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧*/
@ApiModelProperty(value = "淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧")
@@ -110,6 +111,7 @@
private String confirmComment;
/**鍒濋獙鏀朵汉*/
@ApiModelProperty(value = "鍒濋獙鏀朵汉")
+ @Dict(dicCode = "sys_user, realname, username")
private String initialAcceptanceUser;
/**鍒濋獙鏀舵椂闂�*/
@ApiModelProperty(value = "鍒濋獙鏀舵椂闂�")
@@ -124,6 +126,7 @@
private String initialAcceptanceFiles;
/**缁堥獙鏀朵汉*/
@ApiModelProperty(value = "缁堥獙鏀朵汉")
+ @Dict(dicCode = "sys_user, realname, username")
private String finalAcceptanceUser;
/**缁堥獙鏀舵椂闂�*/
@ApiModelProperty(value = "缁堥獙鏀舵椂闂�")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index 14484fa..8eb1d69 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -384,6 +384,7 @@
entity.setConfirmUser(user.getUsername());
entity.setConfirmComment(request.getConfirmComment());
entity.setConfirmTime(new Date());
+ entity.setConfirmDealType(request.getConfirmDealType());
if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
//椹冲洖
userApprovalList = new ArrayList<>();
--
Gitblit v1.9.3