From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt | 12 ++++++++++-- 1 files changed, 10 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 6f4c5b7..e182a98 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseExcel.kt @@ -1,12 +1,14 @@ package cn.flightfeather.supervision.business.report import org.apache.poi.hssf.usermodel.HSSFWorkbook +import java.io.File import java.io.FileOutputStream import java.io.OutputStream import java.util.* /** * 鍚勬ā鏉垮悎骞惰緭鍑轰负鏁翠綋鏂囨。 + * 鍗曚釜鏁版嵁婧� */ abstract class BaseExcel(val dataSource: DataSource) { @@ -17,9 +19,15 @@ // excel鏂囨。 private var workbook = HSSFWorkbook() + fun getReportName(): String = "${dataSource.areaName()}-${fileName}.xlsx" + fun toFile(path: String) { - val fileName = "${dataSource.areaName()}-${fileName}-${Date().time}.xls" - val out = FileOutputStream(path + fileName) + val fileName = getReportName() + val file = File(path + fileName) + if (!file.parentFile.exists()) { + file.parentFile.mkdirs() + } + val out = FileOutputStream(file) toOutputStream(out) } -- Gitblit v1.9.3