From c1becf4cbd2e99601ce011c14b8742427249cfb4 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 09 一月 2024 17:25:05 +0800
Subject: [PATCH] 1. 多项调整

---
 src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeRankMainSummary.kt |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 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 1eec3c3..1de9b3d 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
@@ -3,18 +3,32 @@
 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: MutableList<Summary>) {
+        //鎺掑悕闈犲墠鐨刴ax涓棶棰樿璁ゅ畾涓轰富瑕佹垨鍏稿瀷闂
         val max = when (dataSource.config.sceneType.toString()) {
-            Constant.ScenseType.TYPE1.value -> 5
+            Constant.SceneType.TYPE1.value -> 5
             else -> 4
         }
 
         summarys.sortByDescending { it.count }
+
+        var tPros = 0
+        var mainTPros = 0
+        var pDes = ""
+        for (i in summarys.indices) {
+            val it = summarys[i]
+            tPros += it.count
+            if (i < max) {
+                val lr = if (i > 0) "\n" else ""
+                mainTPros += it.count
+                pDes += "${lr}${i+1}銆�${it.proDes}"
+            }
+        }
+        var per = if (tPros == 0) .0 else mainTPros.toDouble() / tPros
 
         head.clear()
         head.add(
@@ -41,16 +55,23 @@
                 ExcelUtil.MyCell("涓昏闂鍗犳瘮"),
             )
         )
-        for (i in summarys.indices) {
-            if (i >= max) break
+//        for (i in summarys.indices) {
+//            if (i >= max) break
+//
+//            val s = summarys[i]
+//            contents.add(
+//                mutableListOf(
+//                    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)
+//                )
+//            )
+//        }
 
-            val s = summarys[i]
-            contents.add(
-                mutableListOf(
-                    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)
-                )
+        contents.add(
+            mutableListOf(
+                1, dataSource.year, dataSource.month, dataSource.rowData.scene?.type ?: "", dataSource.area, tPros,
+                pDes, mainTPros, ExcelUtil.MyCell(per.toString(), isPercent = true)
             )
-        }
+        )
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3