From a3f4b40eb72e31d9db7b6bba58aa81ccbea9c671 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 15 七月 2025 20:16:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java | 3 ---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 3 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java
index 80c3edd..0abf971 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java
@@ -6,6 +6,7 @@
DEPART_MANAGER_SIGNING, //閮ㄩ棬棰嗗绛惧瓧涓�
PRODUCTION_SUPPORT_SIGNING, //淇濋殰閮ㄩ瀵肩瀛椾腑
ABOLISH, //宸蹭綔搴�
+ REJECTED, //宸查┏鍥�
COMPLETED, //宸插畬鎴�
;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
index 010c09e..da1b55f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
@@ -110,9 +110,6 @@
if (request == null) {
return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
}
- if(CollectionUtil.isEmpty(request.getTableDetailList())) {
- return Result.error("妫�鏌ユ槑缁嗕俊鎭负绌猴紒");
- }
// 妫�鏌ヨ姹傚弬鏁�
if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
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 652121e..941c25f 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
@@ -331,6 +331,9 @@
List<UserSelector> userSelectors;
switch (status) {
case UNDER_EVALUATION:
+ if(CollectionUtil.isEmpty(request.getTableDetailList())) {
+ throw new JeecgBootException("妫�鏌ユ槑缁嗕俊鎭负绌猴紒");
+ }
boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
//鎵ц瀹屾垚
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
--
Gitblit v1.9.3