From 6b0cfa71834e1702806322140be6d56a6ec903a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 14 Jun 2026 19:03:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(inspection):=20=E4=BF=AE=E5=A4=8D=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1AQL=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了硬编码的AQL类型判断逻辑 - 修改为直接使用字典项ID作为检验类型条件 - 解决了无法正确匹配AQL类型导致的数据查询问题 - 优化了代码可读性和维护性 --- .../service/IncomingInspectionTaskControllerService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 7c8e4335..36d7ad52 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -963,14 +963,13 @@ public class IncomingInspectionTaskControllerService { .one(); VUtil.trueThrowBusinessError(Objects.isNull(incomingInspectionTaskAqlRule)).throwMessage("该任务未设置AQL类型"); DictionaryItem dictionaryItem = dictionaryItemService.getById(incomingInspectionTaskAqlRule.getUsedAqlType()); - Integer aqltype = StrUtil.contains(dictionaryItem.getName(), "正常") - ? 0 - : (StrUtil.contains(dictionaryItem.getName(), "加严") ? 1 : 2); +// Integer aqltype = StrUtil.contains(dictionaryItem.getName(), "正常") +// ? 0 +// : (StrUtil.contains(dictionaryItem.getName(), "加严") ? 1 : 2); QmsCodeLetterMatrix codeLetterMatrix = codeLetterMatrixService.lambdaQuery() .eq(QmsCodeLetterMatrix::getSamplingPlanId, samplingPlan.getId()) .eq(QmsCodeLetterMatrix::getCodeLetterId, codeLetterId) - .eq(QmsCodeLetterMatrix::getInspectionType, aqltype) - .last("LIMIT 1") + .eq(QmsCodeLetterMatrix::getInspectionType, dictionaryItem.getId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(codeLetterMatrix)).throwMessage("未找到对应的字码矩阵"); return codeLetterMatrix.getSampleSize();