From 16b961c2210fe29fd494ac1f9d830dd93503961f Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 02 八月 2024 17:25:17 +0800 Subject: [PATCH] 1. 新增监测设备的管理功能 --- src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColLedger.kt | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 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 9f2b23f..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 @@ -2,9 +2,16 @@ import cn.flightfeather.supervision.business.report.BaseCols import cn.flightfeather.supervision.business.report.DataSource +import cn.flightfeather.supervision.common.utils.DateUtil import cn.flightfeather.supervision.common.utils.ExcelUtil +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("鍙拌处鎻愪氦鐧惧垎姣�"), @@ -14,6 +21,19 @@ } override fun onOneRow(rowData: DataSource.RowData): List<Any> { - return listOf("", "", "") + rowData.ledgerRecords.sortedByDescending { + it.lrSubmitdate + } + val per = rowData.ledgerRecords.size.toDouble() / rowData.ledgerCount + var t1 = "" + var t2 = "/" + if (rowData.ledgerRecords.isNotEmpty()) { + val r = rowData.ledgerRecords[0] + 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) } } \ No newline at end of file -- Gitblit v1.9.3