From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
index de1b2b1..b25c467 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
@@ -259,13 +259,12 @@
entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
values.put("NextAssignee", userApprovalList);
- // 淇敼璁惧鐘舵��
- equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
} else {
//璁剧疆entity
- entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_SUBMIT.name());
- // 淇敼璁惧鐘舵��
+ entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
}
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
entity.setApprovalUser(user.getUsername());
entity.setApprovalComment(request.getApprovalComment());
entity.setApprovalTime(new Date());
--
Gitblit v1.9.3