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 f0132e01..df914948 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 @@ -649,7 +649,8 @@ 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(); @@ -657,14 +658,14 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { JSONArray array = JSON.parseArray(forecastResult); for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) { JSONObject item = array.getJSONObject(forecIndex); - if (targetParameterList.contains(item.getString("simpleName"))) { + if (targetParameterList.contains(item.getString("simpleName")) && StringUtils.isNotBlank(configAssayMethodProjectParameterDO.getKey()) && configAssayMethodProjectParameterDO.getKey().equals(item.getString("simpleName"))) { businessAssayParameterDataDO.setValue(item.getString("value")); break; } } } } - + businessAssayParameterDataDOList.add(businessAssayParameterDataDO); } } else { @@ -685,6 +686,7 @@ 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(); @@ -692,7 +694,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { JSONArray array = JSON.parseArray(forecastResult); for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) { JSONObject item = array.getJSONObject(forecIndex); - if (targetParameterList.contains(item.getString("simpleName"))) { + if (targetParameterList.contains(item.getString("simpleName")) && StringUtils.isNotBlank(configAssayMethodProjectParameterDO.getKey()) && configAssayMethodProjectParameterDO.getKey().equals(item.getString("simpleName"))) { businessAssayParameterDataDO.setValue(item.getString("value")); break; }