From 1a45c6fe9ea814e432cf90c0169be9b7d991a266 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 10 十二月 2024 13:51:00 +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/location/UtilFile.kt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/location/UtilFile.kt b/src/main/kotlin/cn/flightfeather/supervision/business/location/UtilFile.kt
index 238fcb0..87f3bdb 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/location/UtilFile.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/location/UtilFile.kt
@@ -8,7 +8,7 @@
import java.io.FileOutputStream
import java.util.*
-class UtilFile {
+class UtilFile(head: List<ExcelUtil.MyCell>? = null) {
private val heads = mutableListOf<Array<Any>>()
private val contents = mutableListOf<Array<Any>>()
@@ -25,7 +25,7 @@
// ExcelUtil.MyCell("瀹堟硶鑷祴鑷瘎", colSpan = 3),
// ExcelUtil.MyCell("绾夸笂鐩戠缁煎悎椋庨櫓鍒嗘瀽涓庡绛�", colSpan = 3),
// )
- val h2 = listOf(
+ val h2 = head ?: listOf(
ExcelUtil.MyCell("璺", colSpan = 1),
ExcelUtil.MyCell("搴忓彿", colSpan = 1),
ExcelUtil.MyCell("鍗曚綅鍚嶇О", colSpan = 1),
@@ -79,7 +79,7 @@
fun outPutToFile(distance: Double? = null) {
val workbook = HSSFWorkbook()
val tag = if (distance == null) "" else "${distance}绫�"
- val fileName = "鍛ㄨ竟${tag}鐐逛綅-${DateUtil().DateToString(Date(), "yyyy-MM-ddhhmmss")}.xls"
+ val fileName = "鍛ㄨ竟${tag}鐐逛綅-${DateUtil.DateToString(Date(), "yyyy-MM-ddhhmmss")}.xls"
val filePath = "C:\\work\\宸ヤ綔\\绗笁鏂圭洃绠\鍛ㄨ竟鐐逛綅\\$fileName"
val out = FileOutputStream(File(filePath))
ExcelUtil.write(heads, contents, workbook)
--
Gitblit v1.9.3