From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java b/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java
index 0b5abb7..2761b39 100644
--- a/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java
+++ b/yudao-module-qcreport/src/main/java/cn/iocoder/yudao/module/qcreport/engine/report/ReportEvaluator.java
@@ -122,9 +122,11 @@
int total = items.size();
// 鍚堟牸鐜囩殑鍒嗘瘝鍙畻銆岃兘鍒ゅ畾銆嶇殑椤癸紝鏃犲垽瀹氳鍒欑殑椤规棦涓嶅姞鍒嗕篃涓嶅噺鍒�
int decidableCount = total - undecidableCount;
+ boolean hasPendingItem = items.stream().anyMatch(item -> QualityResult.PENDING_TEXT.equals(item.getResultText()));
QualityResult verdict = null;
- if (!reportRules.isEmpty()) {
+ // 缂哄皯妫�楠屼緷鎹椂锛屽嵆浣挎姤鍛婄骇瑙勫垯鑳界畻鍑哄竷灏斿�硷紝涔熶笉鑳界敓鎴愮‘瀹氱粨璁恒��
+ if (!hasPendingItem && !reportRules.isEmpty()) {
Map<String, Object> scoped = context.scope(items);
scoped.put("index", 0);
boolean passed = true;
@@ -140,7 +142,7 @@
}
}
verdict = failed ? null : (passed ? QualityResult.PASS : QualityResult.FAIL);
- } else if (decidableCount > 0) {
+ } else if (!hasPendingItem && decidableCount > 0) {
// 鍙湁銆屽叏閮ㄥ彲鍒ゅ畾椤归兘鍚堟牸銆嶆墠缁欏悎鏍肩粨璁恒�傛棤鍒ゅ畾瑙勫垯鐨勯」涓嶅弬涓庯紝瀹冧滑娌℃湁瀵归敊鍙█銆�
// 瀛樺湪寰呭垽瀹氶」锛堣鍒欒窇鎸傦級鏃朵笉缁欑粨璁猴細娌￠獙杩囦笉鑳借鍚堟牸锛屾病璇佹嵁涔熶笉鑳借涓嶅悎鏍硷紝
// 鍚﹀垯浼氬嚭鐜般�岀粨璁哄悎鏍笺�佸悎鏍肩巼 0%銆嶈繖绉嶈嚜鐩哥煕鐩剧殑鎶ュ憡銆�
--
Gitblit v1.9.3