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/ProTypeStatusSummary.kt | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeStatusSummary.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeStatusSummary.kt
index aa6e38a..2a12726 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeStatusSummary.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeStatusSummary.kt
@@ -6,7 +6,6 @@
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.ExcelUtil
import cn.flightfeather.supervision.domain.ds1.entity.SceneConstructionSite
-import kotlin.math.round
class ProTypeStatusSummary(dataSource: DataSource) : BaseTemplate(dataSource) {
override val cols: List<BaseCols> = listOf()
@@ -14,8 +13,9 @@
@Throws(Exception::class)
override fun execute() {
- if (dataSource.config.sceneType.toString() != Constant.ScenseType.TYPE1.value) {
- throw IllegalStateException("${templateName}鍙兘閽堝宸ュ湴杩涜鍒嗘瀽锛屽綋鍓嶄紶鍏ュ満鏅被鍨嬬紪鍙蜂负${dataSource.config.sceneType}")
+ if (dataSource.config.sceneType.toString() != Constant.SceneType.TYPE1.value) {
+// throw IllegalStateException("${templateName}鍙兘閽堝宸ュ湴杩涜鍒嗘瀽锛屽綋鍓嶄紶鍏ュ満鏅被鍨嬬紪鍙蜂负${dataSource.config.sceneType}")
+ println("sadas")
}
dataSource.reset()
@@ -23,7 +23,8 @@
val proMap = mutableMapOf<String?, MutableMap<String?, Summary>>()
dataSource.loop { _, rowData ->
rowData.problems.forEach {
- val s = (rowData.baseScene as SceneConstructionSite?)?.csStatus
+ val baseScene = rowData.baseScene as SceneConstructionSite?
+ val s = baseScene?.siExtension1
if (!proMap.containsKey(s)) {
proMap[s] = mutableMapOf()
}
@@ -32,7 +33,8 @@
proMap[s]?.put(pt, Summary().apply {
for (p in rowData.problemTypes) {
if (p.guid == pt) {
- status = s ?: ""
+ stage = s ?: ""
+ status = baseScene?.csStatus ?: ""
proType = p.typename ?: ""
proDes = p.description ?: ""
break
@@ -100,7 +102,7 @@
val s = summarys[i]
contents.add(
mutableListOf(
- i + 1, dataSource.year, dataSource.month, dataSource.rowData.scene?.type ?: "", dataSource.area, s.status, s.status,
+ i + 1, dataSource.year, dataSource.month, dataSource.rowData.scene?.type ?: "", dataSource.area, s.status, s.stage,
s.proType, s.proDes,
s.count, ExcelUtil.MyCell(s.countPer.toString(), isPercent = true),
s.changeNum, ExcelUtil.MyCell(s.changePer.toString(), isPercent = true),
@@ -111,6 +113,7 @@
inner class Summary() {
var status = ""
+ var stage = ""
var proType = ""
var proDes = ""
var count = 0
--
Gitblit v1.9.3