1. 多项调整

feiyu02

2024-01-09 c1becf4cbd2e99601ce011c14b8742427249cfb4

 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