From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt
index f5f6b8b..21bede2 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt
@@ -183,7 +183,7 @@
if (factor != null && tag != null) {
if (tag.exceptionExisted) {
tag.startData?.let {
- resultList.add(newResult(it, lastData, factor, tag.exceptionData))
+ resultList.add(newResult(it, tag.endData, factor, tag.exceptionData))
}
tag.exceptionExisted = false
}
@@ -192,7 +192,7 @@
val tag1 = tagMap[f.main] ?: return@forEach
if (tag1.exceptionExisted) {
tag1.startData?.let {
- resultList.add(newResult(it, lastData, f, tag1.exceptionData))
+ resultList.add(newResult(it, tag1.endData, f, tag1.exceptionData))
}
tag1.exceptionExisted = false
}
@@ -201,7 +201,9 @@
}
- override fun newResult(
+
+
+ fun newResult(
start: BaseRealTimeData,
end: BaseRealTimeData?,
factor: FactorFilter.SelectedFactor,
--
Gitblit v1.9.3