From 0c59552dc14c9023d4c0a9d57509cce1d5a6d6da Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-socket-1129'
---
src/main/kotlin/cn/flightfeather/supervision/business/location/UtilFile.kt | 8 +++++---
1 files changed, 5 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 04e78b4..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),
@@ -33,6 +33,7 @@
ExcelUtil.MyCell("鍗曚綅鍦板潃", colSpan = 1),
ExcelUtil.MyCell("缁忓害", colSpan = 1),
ExcelUtil.MyCell("绾害", colSpan = 1),
+ ExcelUtil.MyCell("鍖哄幙", colSpan = 1),
ExcelUtil.MyCell("琛楅亾", colSpan = 1),
ExcelUtil.MyCell("甯哥敤鑱旂郴浜�", colSpan = 1),
ExcelUtil.MyCell("鑱旂郴鏂瑰紡", colSpan = 1),
@@ -66,6 +67,7 @@
scense.location ?: "",
scense.longitude?.toDouble() ?: .0,
scense.latitude?.toDouble() ?: .0,
+ scense.districtname ?: "",
scense.townname ?: "",
scense.contacts ?: "",
scense.contactst ?: ""
@@ -77,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