From 876e8a1c9e6e950d51e42f265ad3027869d4f908 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期二, 22 七月 2025 18:26:06 +0800
Subject: [PATCH] 修改点检结果为异常,异常是否报修为否的情况下生成故障数据的逻辑;设备附件列表新增描述信息丢失

---
 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