From a5cdbf569067822e3232d2177b8a9aac1ed95b69 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 29 五月 2024 17:32:00 +0800
Subject: [PATCH] 1. 修改自评逻辑中，问题整改的判断方式为已整改并且整改审核通过； 2. 新增评估详情获取接口;
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/XHFuDataAnalysis.kt | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/XHFuDataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/XHFuDataAnalysis.kt
index b4f9b26..4f36d06 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/XHFuDataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/XHFuDataAnalysis.kt
@@ -25,7 +25,7 @@
private val fumeSiteMapMapper: FumeSiteMapMapper,
private val fumeDailyAnalysisMapper: FumeDailyAnalysisMapper,
private val fumeExceptionDataMapper: FumeExceptionDataMapper,
-): AopDataAnalysis<FumeDailyAnalysis>(aopDbMapper, aopSceneTypeCheck, aopOutput) {
+) : AopDataAnalysis<FumeDailyAnalysis>(aopDbMapper, aopSceneTypeCheck, aopOutput) {
// 娌圭儫鏁版嵁鏆傛棤鍖哄潎鍊肩殑璁＄畻
override fun districtAvg(source: AopDataSource?): Double? {
@@ -45,7 +45,11 @@
val map = mutableMapOf<String?, MutableList<FumeDailyAnalysis?>>()
fumeDailyAnalysisMapper.selectByExample(Example(FumeDailyAnalysis::class.java).apply {
createCriteria().andBetween("fumeDate", evaluationScene.config?.startTime, evaluationScene.config?.endTime)
- .andIn("fumeDevId", deviceCodeList)
+ .apply {
+ if (deviceCodeList.isNotEmpty()) {
+ andIn("fumeDevId", deviceCodeList)
+ }
+ }
}).forEach {
if (!map.containsKey(it?.fumeDevId)) {
map[it?.fumeDevId] = mutableListOf()
@@ -66,7 +70,9 @@
} else {
val code = deviceCodeList[0]
fumeExceptionDataMapper.selectByExample(Example(FumeExceptionData::class.java).apply {
- createCriteria().andBetween("beginTime", evaluationScene.config?.startTime, evaluationScene.config?.endTime)
+ createCriteria().andBetween("beginTime",
+ evaluationScene.config?.startTime,
+ evaluationScene.config?.endTime)
.andEqualTo("devId", code)
.andEqualTo("exception", "鏁版嵁寮傚父")
.andEqualTo("exceptionType", "0")
@@ -122,7 +128,7 @@
): Double {
var total = .0
var count = 0
- dataList.forEach {list ->
+ dataList.forEach { list ->
list.forEach {
val noon = it?.noonOnlineRate?.removeSuffix("%")?.toDouble()?.div(100)
val night = it?.nightOnlineRate?.removeSuffix("%")?.toDouble()?.div(100)
--
Gitblit v1.9.3