From 1565a8e16ad9199a9d41c1e1173211340cf26dec Mon Sep 17 00:00:00 2001 From: wxr Date: Tue, 10 Mar 2026 11:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B7=AE=E5=88=A4=E5=AE=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SampleAnalysisAuditServiceImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index 274130a8..0e18c10d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java @@ -1101,6 +1101,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs(); BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i); BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1); + if (i == 0) {//如果是第1个，需要把preBusinessAssayProjectDataDO放进去 + currentGroup.add(preBusinessAssayProjectDataDO); + } if (diff.compareTo(allowValue) > 0) { businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE); preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_INTERNAL_CONTROL); @@ -1151,6 +1154,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit); //设置判定值 businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString()); + businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL); businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT); //处理勾选 @@ -1232,6 +1236,11 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs(); BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i); BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1); + + if (i == 0) {//如果是第1个，需要把preBusinessAssayProjectDataDO放进去 + currentGroup.add(preBusinessAssayProjectDataDO); + } + if (diff.compareTo(allowValue) > 0) { businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE); preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_REPETITIVENESS); @@ -1288,6 +1297,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit); //设置判定值 businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString()); + businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL); businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT); //处理勾选 @@ -1369,6 +1379,11 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs(); BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i); BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1); + + if (i == 0) {//如果是第1个，需要把preBusinessAssayProjectDataDO放进去 + currentGroup.add(preBusinessAssayProjectDataDO); + } + if (diff.compareTo(allowValue) > 0) { businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE); preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_REPRODUCIBILITY); @@ -1419,6 +1434,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit); //设置判定值 businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString()); + businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL); businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT); //处理勾选