From fd479eeb7dae6ec6b8b83d18e07aa163e8357eff Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 04 八月 2025 21:26:03 +0800
Subject: [PATCH] 改造保养规范流程与升版导入代码

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index 97aaf33..429a12f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -429,11 +429,11 @@
                 }else{
                     userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                     values.put("dataId", entity.getId());
-                    if (StrUtil.isEmpty(request.getManageUserResult())){
-                        request.setManageUserResult("");
+                    if (StrUtil.isEmpty(request.getDealDescription())){
+                        request.setDealDescription("");
                     }
                     values.put("organization",request.getDealDescription());
-                    values.put("comment", request.getManageUserResult());
+                    values.put("comment", request.getDealDescription());
                     values.put("manageUserResult",request.getManageUserResult());
                     request.setComment(request.getDealDescription());
                     if (request.getManageUserResult().equals("2")){
@@ -463,7 +463,7 @@
                     entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_ADMIN_CONFIRM.name());
                     userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0004);
                     if (CollectionUtil.isEmpty(userSelectors)) {
-                        throw new JeecgBootException("璁惧鏈瓨鍦ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+                        throw new JeecgBootException("璁惧鏈瓨鍦ㄨ溅闂磋澶囩鐞嗗憳锛屾棤娉曡繘鍏ラ┏鍥炲鎵癸紒");
                     }else{
                         userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                         values.put("NextAssignee", userApprovalList);

--
Gitblit v1.9.3