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/BaseTemplate.kt | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplate.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplate.kt
index fefb508..a053d99 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplate.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplate.kt
@@ -1,14 +1,12 @@
package cn.flightfeather.supervision.business.report
-import cn.flightfeather.supervision.common.utils.Constant
-import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.ExcelUtil
-import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
+import cn.flightfeather.supervision.business.report.bean.BaseTemplateResult
import org.apache.poi.hssf.usermodel.HSSFWorkbook
-import tk.mybatis.mapper.entity.Example
import java.io.FileOutputStream
import java.io.OutputStream
import java.util.*
+import kotlin.reflect.full.createInstance
/**
* excel鎶ュ憡妯℃澘鍩虹被
@@ -23,14 +21,20 @@
//妯℃澘鍚嶇О
abstract val templateName: String
+ // 涓棿缁撴灉瀵硅薄 by hc 2024.12.5
+ abstract var resultObjects: MutableList<BaseTemplateResult>
+
+ // 鎵ц鐘舵�� by hc 2024.12.5
+ var isExecuted: Boolean = false
+
//琛ㄥご
val head = mutableListOf<MutableList<ExcelUtil.MyCell>>()
//鍐呭
val contents = mutableListOf<MutableList<Any>>()
-
- open fun execute() {
+ // 鐢熸垚Template鐩稿叧鏁版嵁 by hc 2024.12.9
+ open fun genData() {
//鏁版嵁婧愰噸缃�
dataSource.reset()
//鍚堟垚琛ㄥご
@@ -49,6 +53,16 @@
}
}
+ open fun execute() {
+ try {
+ genData()
+ // 娌℃湁閿欒姝ｅ父杩愯缁撴潫
+ isExecuted = true
+ } catch (e: Exception) {
+ // TODO: handle exception
+ }
+ }
+
override fun toWorkBook(wb: HSSFWorkbook) {
val f = tableFormat()
ExcelUtil.write(f.first, f.second, wb, templateName)
@@ -60,6 +74,33 @@
}
/**
+ * 杈撳嚭鍒板璞�
+ * hc 2024.12.06
+ */
+ fun toObject(): MutableList<BaseTemplateResult> {
+ if (!isExecuted) {
+ execute()
+ }
+ // 鑾峰緱鍜宼emplate瀵瑰簲鐨勪腑闂寸粨鏋滄暟鎹璞CLASS瀵硅薄
+ val classType = resultObjects.first()::class
+ try {
+ // 娓呯┖鏁扮粍
+ resultObjects.clear()
+ contents.forEach {
+ // 鍒涘缓瀵瑰簲鐨勪腑闂寸粨鏋滄暟鎹璞�
+ val resultObj = classType.createInstance()
+ resultObj.setProperties(it)
+ resultObjects.add(resultObj)
+ }
+ }catch (e: Exception) {
+ // 濡傛灉鍑虹幇寮傚父鎭㈠鍒板垵濮嬬姸鎬� 閬垮厤涓嬫璋冪敤toObject鏁版嵁閲嶅
+ resultObjects.clear()
+ resultObjects.add(classType.createInstance())
+ }
+ return resultObjects
+ }
+
+ /**
* 杈撳嚭涓烘枃妗�
*/
override fun toFile(path: String) {
--
Gitblit v1.9.3