From c55c9a51cea46caea88b2bee5cc3c9ddaa9fc468 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期三, 11 十二月 2024 08:44:22 +0800
Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现：问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注：除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象，因此这里还有报错信息
---
src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt
index 6ac0c6a..ef49da5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt
@@ -1,12 +1,8 @@
package cn.flightfeather.supervision.business.report
-import cn.flightfeather.supervision.common.exception.ResponseErrorException
-import cn.flightfeather.supervision.common.utils.Constant
-import cn.flightfeather.supervision.common.utils.DateUtil
+import cn.flightfeather.supervision.common.exception.BizException
import cn.flightfeather.supervision.common.utils.ExcelUtil
-import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
import org.apache.poi.hssf.usermodel.HSSFWorkbook
-import tk.mybatis.mapper.entity.Example
import java.io.FileOutputStream
import java.io.OutputStream
import java.util.*
@@ -32,7 +28,7 @@
open fun execute() {
- if (dataSourceList.isEmpty()) throw ResponseErrorException("${templateName}: 鏁版嵁婧愪负绌�")
+ if (dataSourceList.isEmpty()) throw BizException("${templateName}: 鏁版嵁婧愪负绌�")
//鍚堟垚琛ㄥご
cols.forEach {
it.combineHead(head, dataSourceList[0])
@@ -85,19 +81,21 @@
val c = mutableListOf<Array<Any>>()
head.forEach { h.add(it.toTypedArray()) }
contents.forEach { c.add(it.toTypedArray()) }
- val index = c[0][0]
- //鎸夌収绗竴鍒楄繘琛屾帓搴�
- if (index is Int) {
- c.sortBy {
- if (it[0] is Int) {
- it[0] as Int
- } else {
- 0
+ if (c.isNotEmpty() && c[0].isNotEmpty()) {
+ val index = c[0][0]
+ //鎸夌収绗竴鍒楄繘琛屾帓搴�
+ if (index is Int) {
+ c.sortBy {
+ if (it[0] is Int) {
+ it[0] as Int
+ } else {
+ 0
+ }
}
- }
- } else {
- c.sortBy {
- it[0].toString()
+ } else {
+ c.sortBy {
+ it[0].toString()
+ }
}
}
return Pair(h, c)
@@ -116,19 +114,21 @@
contents.forEach {
c.add(it.toTypedArray())
}
- val index = c[0][0]
- //鎸夌収绗竴鍒楄繘琛屾帓搴�
- if (index is Int) {
- c.sortBy {
- if (it[0] is Int) {
- it[0] as Int
- } else {
- 0
+ if (c.isNotEmpty() && c[0].isNotEmpty()) {
+ val index = c[0][0]
+ //鎸夌収绗竴鍒楄繘琛屾帓搴�
+ if (index is Int) {
+ c.sortBy {
+ if (it[0] is Int) {
+ it[0] as Int
+ } else {
+ 0
+ }
}
- }
- } else {
- c.sortBy {
- it[0].toString()
+ } else {
+ c.sortBy {
+ it[0].toString()
+ }
}
}
return Pair(h, c)
--
Gitblit v1.9.3