From c03e1d823eb86c856ecbe40d8d2180ffce7c7b0f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 14 十一月 2025 17:45:39 +0800
Subject: [PATCH] 2025.11.14 新增值域的增删改接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
index d13bfe1..4fe2ea5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
@@ -7,6 +7,10 @@
import cn.flightfeather.supervision.lightshare.service.DataProdBaseService
import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
import cn.flightfeather.supervision.lightshare.vo.dataprod.*
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPEvaluateInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPInspectionInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPMonitorDataInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPSceneInfo
import org.springframework.beans.BeanUtils
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
@@ -139,10 +143,10 @@
evaluate = it
val score = it.resultscorebef?.toIntOrNull() ?: -1
scoreLevel = when {
- score in 0..39 -> Constant.EvaluationLevel.D.text
- score in 40..89 -> Constant.EvaluationLevel.C.text
- score in 90..99 -> Constant.EvaluationLevel.B.text
- score >= 100 -> Constant.EvaluationLevel.A.text
+ score in 0..49 -> Constant.EvaluationLevel.D.text
+ score in 50..89 -> Constant.EvaluationLevel.C.text
+ score in 90..94 -> Constant.EvaluationLevel.B.text
+ score >= 95 -> Constant.EvaluationLevel.A.text
else -> ""
}
})
@@ -160,6 +164,20 @@
val res = mutableListOf<DPInspectionInfo>()
val subtaskList = aopDbMapper.subtaskMapper.selectByExample(Example(Subtask::class.java).apply {
createCriteria().andEqualTo("tguid", queryOpt.topTaskId)
+ .andEqualTo("provincecode", queryOpt.provinceCode)
+ .andEqualTo("citycode", queryOpt.cityCode)
+ .andEqualTo("districtcode", queryOpt.districtCode)
+ .apply {
+// queryOpt.topTaskId?.let { topTaskId ->
+// andEqualTo("tguid", topTaskId)
+// }
+ queryOpt.startTime?.let { startTime ->
+ andGreaterThanOrEqualTo("planstarttime", startTime)
+ }
+ queryOpt.endTime?.let { endTime ->
+ andLessThanOrEqualTo("planstarttime", endTime)
+ }
+ }
})
if (subtaskList.isEmpty()) return@queryCache emptyList<DPInspectionInfo>()
--
Gitblit v1.9.3