From 2a30092c6e1efa28b5ca29a1b518356a08b4044c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 03 七月 2025 15:06:25 +0800
Subject: [PATCH] 修改设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 a9242cb..d19d873 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
@@ -357,15 +357,15 @@
case UNDER_MAINTENANCE:
//鎵ц瀹屾垚
//璁惧绠＄悊鍛樼‘璁�
- String equipmentManager = equipment.getEquipmentManager();
- if(StringUtils.isBlank(equipmentManager)) {
- throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
- }
- userApprovalList = Collections.singletonList(equipmentManager);
+// String equipmentManager = equipment.getEquipmentManager();
+// if(StringUtils.isBlank(equipmentManager)) {
+// throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+// }
+// userApprovalList = Collections.singletonList(equipmentManager);
values.put("dataId", entity.getId());
values.put("organization", "浜屼繚鎵ц缁撴潫");
values.put("comment", "浜屼繚鎵ц缁撴潫");
- values.put("NextAssignee", userApprovalList);
+// values.put("NextAssignee", userApprovalList);
request.setComment("浜屼繚鎵ц缁撴潫");
//璁剧疆entity
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_CONFIRM.name());
@@ -389,7 +389,7 @@
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name());
break;
case WAIT_CONFIRM:
- userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(),null, BusinessCodeConst.PCR0003);
if (CollectionUtil.isEmpty(userSelectors)) {
throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
}
--
Gitblit v1.9.3