From 04d9746fb79551714e1b6636626e76b46d2fefa9 Mon Sep 17 00:00:00 2001 From: wxr Date: Fri, 31 Oct 2025 13:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=9D=AF=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SampleAnalysisAuditServiceImpl.java | 32 +++++++++++++++++++ 1 file changed, 32 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 c8e9651..3156861 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 @@ -323,6 +323,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic businessSubSampleAssessmentDO.setDecimalPosition(businessAssayProjectDataDO.getDecimalPosition()); businessSubSampleAssessmentDO.setAssayType(businessAssayTaskDataDO.getAssayType()); businessSubSampleAssessmentDO.setTaskType(businessAssayTaskDataDO.getTaskType()); + businessSubSampleAssessmentDO.setUsage(businessAssayProjectDataDO.getUsage()); + businessSubSampleAssessmentDO.setSymbol(businessAssayProjectDataDO.getSymbol()); businessSubSampleAssessmentDO.setAssessmentStatus(QmsCommonConstant.NORMAL); // 排序并处理 null @@ -376,6 +378,36 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic } else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(businessAssayTaskDataDO.getAssayType())) { } else {//单杯 + //查询分析项目 + List businessAssayProjectDataDOList = businessAssayProjectDataMapper.selectList(new LambdaQueryWrapperX().in(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataIdList)); + + for (BusinessAssayProjectDataDO businessAssayProjectDataDO : businessAssayProjectDataDOList) { + + //查询判定结果数据 + BusinessSubSampleAssessmentDO businessSubSampleAssessmentDO = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId()); + if (businessSubSampleAssessmentDO == null) { + businessSubSampleAssessmentDO = new BusinessSubSampleAssessmentDO(); + + saveBusinessSubSampleAssessmentDOList.add(businessSubSampleAssessmentDO); + } else { + updateBusinessSubSampleAssessmentDOList.add(businessSubSampleAssessmentDO); + } + businessSubSampleAssessmentDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId()); + businessSubSampleAssessmentDO.setBusinessSubSampleId(businessAssayTaskDataDO.getBusinessSubSampleId()); + businessSubSampleAssessmentDO.setConfigAssayMethodId(businessAssayTaskDataDO.getConfigAssayMethodId()); + businessSubSampleAssessmentDO.setConfigAssayMethodProjectId(businessAssayProjectDataDO.getConfigAssayMethodProjectId()); + businessSubSampleAssessmentDO.setDictionaryProjectId(businessAssayProjectDataDO.getDictionaryProjectId()); + businessSubSampleAssessmentDO.setDataType(businessAssayProjectDataDO.getDataType()); + businessSubSampleAssessmentDO.setDecimalPosition(businessAssayProjectDataDO.getDecimalPosition()); + businessSubSampleAssessmentDO.setAssayType(businessAssayTaskDataDO.getAssayType()); + businessSubSampleAssessmentDO.setTaskType(businessAssayTaskDataDO.getTaskType()); + businessSubSampleAssessmentDO.setUsage(businessAssayProjectDataDO.getUsage()); + businessSubSampleAssessmentDO.setSymbol(businessAssayProjectDataDO.getSymbol()); + businessSubSampleAssessmentDO.setAssessmentStatus(QmsCommonConstant.NORMAL); + businessSubSampleAssessmentDO.setAssessmentValue(businessAssayProjectDataDO.getValue()); + } + + }