1. 多项调整

feiyu02

2024-01-09 c1becf4cbd2e99601ce011c14b8742427249cfb4

 src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt

@@ -12,7 +12,6 @@
import cn.flightfeather.supervision.domain.ds1.entity.SceneMixingPlant
import cn.flightfeather.supervision.domain.ds1.entity.SceneStorageYard
import cn.flightfeather.supervision.domain.ds1.entity.SceneWharf
import kotlin.math.round

/**
 * 分街镇问题整改分析汇总表
@@ -34,7 +33,7 @@

            val r = cols[0].getOneRow(rowData)
            val r1 = cols[1].getOneRow(rowData)
//            val r2 = cols[2].getOneRow(rowData)
            val r2 = cols[2].getOneRow(rowData)

            val k = rowData.scene?.townname
            if (!districtMap.containsKey(k)) {
@@ -47,16 +46,16 @@
            districtMap[k]?.apply {
                sceneCount++
                val status = when (dataSource.config.sceneType.toString()) {
                    Constant.ScenseType.TYPE1.value -> {
                    Constant.SceneType.TYPE1.value -> {
                        (rowData.baseScene as SceneConstructionSite?)?.csStatus
                    }
                    Constant.ScenseType.TYPE2.value -> {
                    Constant.SceneType.TYPE2.value -> {
                        (rowData.baseScene as SceneWharf?)?.getwStatus()
                    }
                    Constant.ScenseType.TYPE3.value -> {
                    Constant.SceneType.TYPE3.value -> {
                        (rowData.baseScene as SceneMixingPlant?)?.mpStatus
                    }
                    Constant.ScenseType.TYPE14.value -> {
                    Constant.SceneType.TYPE14.value -> {
                        (rowData.baseScene as SceneStorageYard?)?.syStatus
                    }
                    else -> ""
@@ -76,15 +75,11 @@
                changeNum += cNum


                //根据规范性和监管策略结果判断是否为重点监管对象
                val standard = r1[1] as ExcelUtil.MyCell
                if (standard.text.contains("严重不规范")) {
                if (standard.text.contains("严重不规范") || r2[0].toString().contains("7、")) {
                    focusSceneNum++
                }

                //根据监管策略结果判断是否为重点监管对象
//                if (r2[0].toString().contains("7、")) {
//                    focusSceneNum++
//                }
            }
        }