From a7e82da877b20aa1beef4dadb2a18cf2ce4a04a7 Mon Sep 17 00:00:00 2001 From: wxr Date: Fri, 6 Feb 2026 16:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=93=81=E4=BD=8D=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SampleEntrustGenSampleDataCmp.java | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java index 077ed2b..f0132e0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java @@ -54,6 +54,7 @@ import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext; import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO; import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodConfAdd; import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodConfInfo; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodConfItem; import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodExtendRespVO; import com.zt.plat.module.qms.business.config.dal.dataobject.BaseSampleDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; @@ -446,9 +447,11 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { //扩展配置信息 String configInfomation = configSubSampleMethodDO.getConfigInfomation(); + List getParamList = null; if (StringUtils.isNotBlank(configInfomation)) { ConfigSubSampleMethodConfInfo configSubSampleMethodConfInfo = JSON.parseObject(configInfomation, ConfigSubSampleMethodConfInfo.class); ConfigSubSampleMethodConfAdd addAssayTask = configSubSampleMethodConfInfo.getAddAssayTask(); + getParamList = configSubSampleMethodConfInfo.getGetParam(); if (addAssayTask != null) {//需要添加任务 List conditionProjectIdList = addAssayTask.getConditionProjectIdList(); @@ -647,6 +650,20 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue()); } + if (getParamList != null) { + List targetParameterList = getParamList.stream().filter(f -> f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList()); + String forecastResult = businessSampleEntrustDetailDO.getForecastResult(); + if (StringUtils.isNotBlank(forecastResult)) { + JSONArray array = JSON.parseArray(forecastResult); + for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) { + JSONObject item = array.getJSONObject(forecIndex); + if (targetParameterList.contains(item.getString("simpleName"))) { + businessAssayParameterDataDO.setValue(item.getString("value")); + break; + } + } + } + } businessAssayParameterDataDOList.add(businessAssayParameterDataDO); } @@ -667,7 +684,21 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { if (StringUtils.isNotBlank(configAssayMethodProjectParameterDO.getDefaultValue())) { businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue()); } - + + if (getParamList != null) { + List targetParameterList = getParamList.stream().filter(f -> f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList()); + String forecastResult = businessSampleEntrustDetailDO.getForecastResult(); + if (StringUtils.isNotBlank(forecastResult)) { + JSONArray array = JSON.parseArray(forecastResult); + for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) { + JSONObject item = array.getJSONObject(forecIndex); + if (targetParameterList.contains(item.getString("simpleName"))) { + businessAssayParameterDataDO.setValue(item.getString("value")); + break; + } + } + } + } businessAssayParameterDataDOList.add(businessAssayParameterDataDO); }