From 39e208b6b0482a25c77e53590087c02d9d937563 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 20 七月 2022 09:04:48 +0800
Subject: [PATCH] 1. 巡查汇总报告功能编写完成
---
src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeRankMainSummary.kt | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeRankMainSummary.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeRankMainSummary.kt
index 688d2e2..1eec3c3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeRankMainSummary.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeRankMainSummary.kt
@@ -1,14 +1,20 @@
package cn.flightfeather.supervision.business.report.template
import cn.flightfeather.supervision.business.report.DataSource
+import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.ExcelUtil
import kotlin.math.round
class ProTypeRankMainSummary(dataSource: DataSource) : ProTypeRankSummary(dataSource) {
override val templateName: String = "鏈堝害涓昏鎴栧吀鍨嬮棶棰樺垎鏋愯〃"
- override fun formatTable(summarys: List<Summary>) {
- summarys.sortedByDescending { it.count }
+ override fun formatTable(summarys: MutableList<Summary>) {
+ val max = when (dataSource.config.sceneType.toString()) {
+ Constant.ScenseType.TYPE1.value -> 5
+ else -> 4
+ }
+
+ summarys.sortByDescending { it.count }
head.clear()
head.add(
@@ -36,11 +42,13 @@
)
)
for (i in summarys.indices) {
+ if (i >= max) break
+
val s = summarys[i]
contents.add(
mutableListOf(
- i + 1, "", "", dataSource.rowData.scene?.type ?: "", "", s.count,
- s.proDes, s.count, "${round(s.countPer * 1000) / 10}%"
+ i + 1, dataSource.year, dataSource.month, dataSource.rowData.scene?.type ?: "", dataSource.area, s.count,
+ s.proDes, s.count, ExcelUtil.MyCell(s.countPer.toString(), isPercent = true)
)
)
}
--
Gitblit v1.9.3