zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

超差判定修改

Browse Source
This commit is contained in:
王兴荣
2026-03-10 11:59:57 +08:00
parent ea2778ce4e
commit 1565a8e16a
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
View File

@@ -1101,6 +1101,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs(); BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs();
BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i); BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i);
BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1); BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1);
if (i == 0) {//如果是第1个，需要把preBusinessAssayProjectDataDO放进去
currentGroup.add(preBusinessAssayProjectDataDO);
}
if (diff.compareTo(allowValue) > 0) { if (diff.compareTo(allowValue) > 0) {
businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE); businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE);
preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_INTERNAL_CONTROL); preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_INTERNAL_CONTROL);
@@ -1151,6 +1154,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit); representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit);
//设置判定值 //设置判定值
businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString()); businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString());
businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL);
businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT); 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(); BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs();
BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i); BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i);
BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1); BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1);
if (i == 0) {//如果是第1个，需要把preBusinessAssayProjectDataDO放进去
currentGroup.add(preBusinessAssayProjectDataDO);
}
if (diff.compareTo(allowValue) > 0) { if (diff.compareTo(allowValue) > 0) {
businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE); businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE);
preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_REPETITIVENESS); preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_REPETITIVENESS);
@@ -1288,6 +1297,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit); representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit);
//设置判定值 //设置判定值
businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString()); businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString());
businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL);
businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT); 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(); BigDecimal diff = sortedValues.get(i + 1).subtract(sortedValues.get(i)).abs();
BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i); BusinessAssayProjectDataExtendRespVO preBusinessAssayProjectDataDO = vBySortedValues.get(i);
BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1); BusinessAssayProjectDataExtendRespVO curBusinessAssayProjectDataDO = vBySortedValues.get(i + 1);
if (i == 0) {//如果是第1个，需要把preBusinessAssayProjectDataDO放进去
currentGroup.add(preBusinessAssayProjectDataDO);
}
if (diff.compareTo(allowValue) > 0) { if (diff.compareTo(allowValue) > 0) {
businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE); businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.EXCEEDS_TOLERANCE);
preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_REPRODUCIBILITY); preBusinessAssayProjectDataDO.setAssessmentType(QmsCommonConstant.ASMT_TYPE_REPRODUCIBILITY);
@@ -1419,6 +1434,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit); representativeValue = EffectiveNumberFormatter.formatNumber2(representativeValue, elementScale, effectiveDigit);
//设置判定值 //设置判定值
businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString()); businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString());
businessSubSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL);
businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT); businessSubSampleAssessmentDO.setReportedStatus(QmsCommonConstant.ASMT_PENDING_REPORT);
//处理勾选 //处理勾选