From 5a003a42d2b34e8362910ac1d3e5a8866768e5fe Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期六, 20 十二月 2025 16:50:28 +0800
Subject: [PATCH] 2025.12.20 巡查任务统计相关功能修改
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 b1d9e32..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
@@ -164,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