From 99be60a4c8c1f39eb01d414460cbe0ac76ca97d3 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 七月 2022 17:47:40 +0800
Subject: [PATCH] 1. 巡查汇总报告功能添加整改跟踪提醒统计列； 2. 新增获取巡查任务统计信息接口；
---
src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProTypeStatusSummary.kt | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..ce7cea3 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
@@ -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