From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:13:35 +0800
Subject: [PATCH] 1. 环信码生成时，如果在线场景当期没有评估（未巡查）结果，则延用历史最新一次的结果； 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt
index 62c497c..b950837 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt
@@ -82,12 +82,12 @@
override fun getLocation(sceneType: Int): List<Domainitem> {
val lId = when (sceneType.toString()) {
- Constant.ScenseType.TYPE1.value -> Constant.INDUSTRY_LOCATION_ID
- Constant.ScenseType.TYPE2.value -> Constant.WHARF_LOCATION_ID
- Constant.ScenseType.TYPE14.value -> Constant.STORAGE_YARD_LOCATION_ID
- Constant.ScenseType.TYPE3.value -> Constant.MIX_LOCATION_ID
- Constant.ScenseType.TYPE5.value -> Constant.RESTAURANT_LOCATION_ID
- Constant.ScenseType.TYPE6.value -> Constant.Vehicle_LOCATION_ID
+ Constant.SceneType.TYPE1.value -> Constant.INDUSTRY_LOCATION_ID
+ Constant.SceneType.TYPE2.value -> Constant.WHARF_LOCATION_ID
+ Constant.SceneType.TYPE14.value -> Constant.STORAGE_YARD_LOCATION_ID
+ Constant.SceneType.TYPE3.value -> Constant.MIX_LOCATION_ID
+ Constant.SceneType.TYPE5.value -> Constant.RESTAURANT_LOCATION_ID
+ Constant.SceneType.TYPE6.value -> Constant.Vehicle_LOCATION_ID
else -> Constant.INDUSTRY_LOCATION_ID
}
@@ -96,4 +96,25 @@
orderBy("index")
})
}
+
+ override fun getTaskType(): List<Domainitem> {
+ return domainitemMapper.selectByExample(Example(Domainitem::class.java).apply {
+ createCriteria().andEqualTo("dcguid", Constant.DOMAIN_GUID_TASK_TYPE)
+ orderBy("index")
+ })
+ }
+
+ override fun getDeadlineType(): List<Domainitem> {
+ return domainitemMapper.selectByExample(Example(Domainitem::class.java).apply {
+ createCriteria().andEqualTo("dcguid", Constant.DOMAIN_GUID_TASK_DEADLINE_TYPE)
+ orderBy("index")
+ })
+ }
+
+ override fun getLevelType(): List<Domainitem> {
+ return domainitemMapper.selectByExample(Example(Domainitem::class.java).apply {
+ createCriteria().andEqualTo("dcguid", Constant.DOMAIN_GUID_TASK_LEVEL)
+ orderBy("index")
+ })
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3