From cf7c2dcf8615f81bbfef86bd614a3451deaae7d2 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 01 四月 2025 13:32:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
index c306fc4..9f5f731 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -198,9 +198,10 @@
case MERGEITEM:
List<DataValueVO> predictValue = new ArrayList<>();
if (sampleInfo.getIsAdjust()) {
- // 模拟调整数据查询
+ // 如果模拟调整先查调整结果
predictValue = stAdjustResultService.getPredictValue(columnItem.getParamId(), sampleInfo.getPredictTime());
- } else {
+ }
+ if (CollectionUtils.isEmpty(predictValue)) {
predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
}
if (CollectionUtils.isEmpty(predictValue)) {
--
Gitblit v1.9.3