From 1b5a723592ea63e5eec0bdeef7855b9c40e9df71 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 17:46:35 +0800
Subject: [PATCH] art:三保-设计修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 6121b18..219caca 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -186,7 +186,7 @@
variables.put("proofreading", true);
//骞惰浠诲姟浼氱
variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
- variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
+// variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
if (result != null) {
//鏇存柊璁惧淇濆吇鐘舵��
@@ -257,7 +257,7 @@
variables.put("proofreading", true);
//骞惰浠诲姟浼氱
variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
- variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
+// variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
if (result != null) {
//鏇存柊璁惧淇濆吇鐘舵��
@@ -283,9 +283,9 @@
if (equipment == null) {
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
}
- if (StringUtils.isBlank(equipment.getEquipmentManager())) {
- throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
- }
+// if (StringUtils.isBlank(equipment.getEquipmentManager())) {
+// throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+// }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null || !BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
@@ -312,7 +312,7 @@
variables.put("proofreading", true);
//骞惰浠诲姟浼氱
variables.put("maintenance_execution", Collections.singletonList(sysUser.getUsername()));
- variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
+// variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
if (result != null) {
//鏇存柊璁惧淇濆吇鐘舵��
@@ -368,7 +368,7 @@
case UNDER_MAINTENANCE:
boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
//鎵ц瀹屾垚
- userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0006);
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), null, BusinessCodeConst.PCR0006);
if (CollectionUtil.isEmpty(userSelectors)) {
throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
}
@@ -416,7 +416,7 @@
}
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