From 24a6e95f2645afaa29ca45bc3a590a140a9807a7 Mon Sep 17 00:00:00 2001 From: wxr Date: Mon, 17 Nov 2025 10:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=80=E5=9B=9E=E7=AD=89bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/service/SampleAnalysisServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java index 7a868f4..1a12032 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java @@ -190,7 +190,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { //处理数据 List> datas = new ArrayList<>(); for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { - BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); + BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataDO.getId())).findFirst().orElse(null); Map map = new HashedMap<>(); map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); @@ -448,7 +448,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { //处理数据 List> datas = new ArrayList<>(); for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { - BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); + BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataDO.getId())).findFirst().orElse(null); Map map = new HashedMap<>(); map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); @@ -875,6 +875,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { JSONObject resultJsonObject = new JSONObject(); BusinessAssayTaskDataExtendRespVO businessAssayTaskData = businessAssayTaskDataMapper.selectExtendRespById(businessAssayTaskDataId); + if (businessAssayTaskData == null) { + throw new ServiceException(1_032_100_000, "未找到检测任务业务数据，请检查参数是否正确"); + } + resultJsonObject = (JSONObject) JSON.toJSON(businessAssayTaskData); List> columns = new ArrayList<>(); @@ -916,7 +920,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { List businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByIds(req.getIdList()); for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) { - businessAssayTaskDetailDO.setRollbackStatus("confirmed_return"); + businessAssayTaskDetailDO.setRollbackStatus("returned"); businessAssayTaskDetailDO.setRemark(req.getBackDesc()); }