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/cols/ColSceneName.kt | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt index 979b066..8db38d5 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt @@ -4,16 +4,26 @@ import cn.flightfeather.supervision.business.report.DataSource import cn.flightfeather.supervision.common.utils.ExcelUtil -//鍚嶇О -class ColSceneName() : BaseCols() { +//鍦烘櫙鍚嶇О鍙婄被鍨� +class ColSceneName(chooseIndexList: List<Int> = emptyList()) : BaseCols(chooseIndexList) { override fun onHeads(dataSource: DataSource): MutableList<MutableList<ExcelUtil.MyCell>> { return mutableListOf( - mutableListOf(ExcelUtil.MyCell("琛ㄥ崟缂栧彿"), ExcelUtil.MyCell("鍞竴搴忓彿"), ExcelUtil.MyCell("鍦烘櫙鍚嶇О")) + mutableListOf( + ExcelUtil.MyCell("琛ㄥ崟缂栧彿"), + ExcelUtil.MyCell("鍞竴搴忓彿"), + ExcelUtil.MyCell("鍦烘櫙绫诲瀷"), + ExcelUtil.MyCell("鍦烘櫙鍚嶇О") + ) ) } override fun onOneRow(rowData: DataSource.RowData): List<Any> { // return listOf(rowData.scene?.index ?: -99, rowData.scene?.extension2 ?: "", rowData.scene?.name ?: "") - return listOf(rowData.index + 1, rowData.scene?.index ?: -99, rowData.scene?.name ?: "") + return listOf( + rowData.index + 1, + rowData.scene?.index ?: -99, + rowData.scene?.type ?: "", + rowData.scene?.name ?: "" + ) } } \ No newline at end of file -- Gitblit v1.9.3