From 9af049f7132a4864b7a5cb8dcdfd412eb313fec4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 17:17:07 +0800
Subject: [PATCH] art: 技术状态鉴定工单-流程问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index 7aab053..cf2a3ab 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -343,7 +343,10 @@
values.put("comment", "鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
request.setComment("鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
//璁剧疆entity
- if (parallelCompletion) {
+ if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())
+ && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())
+ && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())
+ && parallelCompletion) {
//澶氫釜浠诲姟閮藉凡瀹屾垚涓旂淮淇涓讳换閮藉凡瀹℃壒閫氳繃,浼氱瀹屾垚锛岃繘琛岀淮淇伐绛惧瓧
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
--
Gitblit v1.9.3