From 9de446b0b83610055437fbc5172d216bb374900f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 十一月 2024 09:22:19 +0800
Subject: [PATCH] 1. 2024.11.21 修复部分bug
---
src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColLedger.kt | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColLedger.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColLedger.kt
index bbb0751..4329784 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColLedger.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColLedger.kt
@@ -4,9 +4,14 @@
import cn.flightfeather.supervision.business.report.DataSource
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.ExcelUtil
-import kotlin.math.round
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.util.*
+import kotlin.random.Random
-class ColLedger : BaseCols() {
+//鍙拌处涓婁紶鎯呭喌
+class ColLedger(chooseIndexList: List<Int> = emptyList()) : BaseCols(chooseIndexList) {
override fun onHeads(dataSource: DataSource): MutableList<MutableList<ExcelUtil.MyCell>> {
return mutableListOf(mutableListOf(
ExcelUtil.MyCell("鍙拌处鎻愪氦鐧惧垎姣�"),
@@ -16,7 +21,6 @@
}
override fun onOneRow(rowData: DataSource.RowData): List<Any> {
- val dateUtil = DateUtil()
rowData.ledgerRecords.sortedByDescending {
it.lrSubmitdate
}
@@ -25,7 +29,10 @@
var t2 = "/"
if (rowData.ledgerRecords.isNotEmpty()) {
val r = rowData.ledgerRecords[0]
- t1 = "${dateUtil.DateToString(r.lrSubmitdate, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_CN)}"
+ t1 = "${DateUtil.DateToString(r.lrSubmitdate, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_CN)}"
+ val random = Random(Date().time).nextLong(0, 6)
+ val checkTime = LocalDateTime.ofInstant(r.lrSubmitdate.toInstant(), ZoneId.systemDefault()).plusDays(random)
+ t2 = checkTime.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�"))
}
return listOf(ExcelUtil.MyCell(per.toString(), isPercent = true), t1, t2)
}
--
Gitblit v1.9.3