From a79454cd4d1719f0a5dfc1ea9615f5780f1b8017 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 6 Aug 2025 14:04:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E6=A0=B7=E7=AE=97=E6=B3=95=E4=BC=98?= =?UTF-8?q?=E5=8C=960806?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/service/impl/QcProCheckServiceImpl.java | 2 +- .../main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index ff5e10b0d..aec763265 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -247,7 +247,7 @@ public class QcProCheckServiceImpl implements QcProCheckService { } if (StringUtils.isNotBlank(qcd.getSamplingPlan())){ //抽样算法 - if (!StringUtils.isNotEmpty(qcd.getSampleQuality())){ + if (StringUtils.isEmpty(qcd.getSampleQuality()) || "0".equals(qcd.getSampleQuality())){ String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan()); int sampleSize = GB2828Sampler.getSampleSize(letter); qcd.setSampleQuality(String.valueOf(sampleSize)); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index a03db8fca..9cf1107ab 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -157,7 +157,8 @@ td.defect_quality defectQuality, td.sample_code sampleCode, qct.quality quality, - qctp.sample_num sampleQuality, + td.sample_quality sampleQuality, +-- qctp.sample_num sampleQuality, td.sample_aql sampleAql, td.check_level checkLevel, qctp.upper_diff upperDiff,