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

来样品位bug修复

Browse Source
This commit is contained in:
王兴荣
2026-02-09 10:53:32 +08:00
parent 0b2d10e662
commit 24a5b4b231
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
View File

@@ -649,7 +649,8 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
if (StringUtils.isNotBlank(configAssayMethodProjectParameterDO.getDefaultValue())) { if (StringUtils.isNotBlank(configAssayMethodProjectParameterDO.getDefaultValue())) {
businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue()); businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue());
} }
//来样品位赋值
if (getParamList != null) { if (getParamList != null) {
List<String> targetParameterList = getParamList.stream().filter(f -> f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList()); List<String> targetParameterList = getParamList.stream().filter(f -> f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList());
String forecastResult = businessSampleEntrustDetailDO.getForecastResult(); String forecastResult = businessSampleEntrustDetailDO.getForecastResult();
@@ -657,14 +658,14 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
JSONArray array = JSON.parseArray(forecastResult); JSONArray array = JSON.parseArray(forecastResult);
for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) { for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) {
JSONObject item = array.getJSONObject(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")); businessAssayParameterDataDO.setValue(item.getString("value"));
break; break;
} }
} }
} }
} }
businessAssayParameterDataDOList.add(businessAssayParameterDataDO); businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
} }
} else { } else {
@@ -685,6 +686,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue()); businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue());
} }
//来样品位赋值
if (getParamList != null) { if (getParamList != null) {
List<String> targetParameterList = getParamList.stream().filter(f -> f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList()); List<String> targetParameterList = getParamList.stream().filter(f -> f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList());
String forecastResult = businessSampleEntrustDetailDO.getForecastResult(); String forecastResult = businessSampleEntrustDetailDO.getForecastResult();
@@ -692,7 +694,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
JSONArray array = JSON.parseArray(forecastResult); JSONArray array = JSON.parseArray(forecastResult);
for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) { for (int forecIndex = 0; forecIndex < array.size(); forecIndex++) {
JSONObject item = array.getJSONObject(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")); businessAssayParameterDataDO.setValue(item.getString("value"));
break; break;
} }