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/BaseExcel.kt | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt
index e182a98..86d3475 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt
@@ -1,10 +1,10 @@
package cn.flightfeather.supervision.business.report
+import cn.flightfeather.supervision.business.report.bean.BaseTemplateResult
import org.apache.poi.hssf.usermodel.HSSFWorkbook
import java.io.File
import java.io.FileOutputStream
import java.io.OutputStream
-import java.util.*
/**
* 鍚勬ā鏉垮悎骞惰緭鍑轰负鏁翠綋鏂囨。
@@ -16,10 +16,23 @@
abstract val fileName: String
+ // 涓棿缁撴灉瀵硅薄 by hc 2024.12.06
+ private val objectResults: MutableList<MutableList<BaseTemplateResult>> = mutableListOf()
+
// excel鏂囨。
private var workbook = HSSFWorkbook()
fun getReportName(): String = "${dataSource.areaName()}-${fileName}.xlsx"
+
+ // 杈撳嚭鍒板璞�
+ fun toObject() {
+ templates.forEach {
+ if (!it.isExecuted) {
+ it.execute()
+ }
+ objectResults.add(it.toObject())
+ }
+ }
fun toFile(path: String) {
val fileName = getReportName()
@@ -33,7 +46,9 @@
fun toOutputStream(out: OutputStream) {
templates.forEach {
- it.execute()
+ if (!it.isExecuted) {
+ it.execute()
+ }
it.toWorkBook(workbook)
}
workbook.write(out)
--
Gitblit v1.9.3