From f565fbc09724992d53ec6632c3e5d1de3325f328 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 11 一月 2024 17:33:44 +0800
Subject: [PATCH] 1. 调整返回接口的异常捕获类为自定义异常类； 2. 修改AreaVo类中时间参数的类型； 3. 新增文档生成任务类型，并新增文档后台生成任务逻辑；
---
src/main/kotlin/cn/flightfeather/supervision/business/report/DataSource.kt | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/DataSource.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/DataSource.kt
index 65594e6..d334b56 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/DataSource.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/DataSource.kt
@@ -11,6 +11,7 @@
import cn.flightfeather.supervision.domain.ds2.mapper.LedgerSubTypeMapper
import cn.flightfeather.supervision.domain.ds2.mapper.UserMapMapper
import cn.flightfeather.supervision.lightshare.vo.ExcelConfigVo
+import org.springframework.stereotype.Component
import tk.mybatis.mapper.entity.Example
import java.time.LocalDateTime
import java.time.ZoneId
@@ -110,7 +111,8 @@
}
})
} else {
- taskSceneIdList = dbMapper.monitorobjectversionMapper.getSceneByType(config.topTaskGuid, config.sceneType, config.townCode)
+ taskSceneIdList = dbMapper.scenseMapper.getSceneByType(config.topTaskGuid, config
+ .sceneType, config.townCode).map { it.guid ?: "" }
dbMapper.subtaskMapper.selectByExample(Example(Subtask::class.java).apply {
createCriteria().andIn("scenseid", taskSceneIdList)
.andEqualTo("tguid", config.topTaskGuid)
@@ -389,6 +391,7 @@
}
}
+@Component
data class DbMapper(
val scenseMapper: ScenseMapper,
val problemlistMapper: ProblemlistMapper,
--
Gitblit v1.9.3