1. 修改自评逻辑中，问题整改的判断方式为已整改并且整改审核通过； 2. 新增评估详情获取接口;

feiyu02

2024-05-29 a5cdbf569067822e3232d2177b8a9aac1ed95b69

 src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/XHFuDataAnalysis.kt

@@ -25,7 +25,7 @@
    private val fumeSiteMapMapper: FumeSiteMapMapper,
    private val fumeDailyAnalysisMapper: FumeDailyAnalysisMapper,
    private val fumeExceptionDataMapper: FumeExceptionDataMapper,
): AopDataAnalysis<FumeDailyAnalysis>(aopDbMapper, aopSceneTypeCheck, aopOutput) {
) : AopDataAnalysis<FumeDailyAnalysis>(aopDbMapper, aopSceneTypeCheck, aopOutput) {

    // 油烟数据暂无区均值的计算
    override fun districtAvg(source: AopDataSource?): Double? {
@@ -45,7 +45,11 @@
        val map = mutableMapOf<String?, MutableList<FumeDailyAnalysis?>>()
        fumeDailyAnalysisMapper.selectByExample(Example(FumeDailyAnalysis::class.java).apply {
            createCriteria().andBetween("fumeDate", evaluationScene.config?.startTime, evaluationScene.config?.endTime)
                .andIn("fumeDevId", deviceCodeList)
                .apply {
                    if (deviceCodeList.isNotEmpty()) {
                        andIn("fumeDevId", deviceCodeList)
                    }
                }
        }).forEach {
            if (!map.containsKey(it?.fumeDevId)) {
                map[it?.fumeDevId] = mutableListOf()
@@ -66,7 +70,9 @@
        } else {
            val code = deviceCodeList[0]
            fumeExceptionDataMapper.selectByExample(Example(FumeExceptionData::class.java).apply {
                createCriteria().andBetween("beginTime", evaluationScene.config?.startTime, evaluationScene.config?.endTime)
                createCriteria().andBetween("beginTime",
                    evaluationScene.config?.startTime,
                    evaluationScene.config?.endTime)
                    .andEqualTo("devId", code)
                    .andEqualTo("exception", "数据异常")
                    .andEqualTo("exceptionType", "0")
@@ -122,7 +128,7 @@
    ): Double {
        var total = .0
        var count = 0
        dataList.forEach {list ->
        dataList.forEach { list ->
            list.forEach {
                val noon = it?.noonOnlineRate?.removeSuffix("%")?.toDouble()?.div(100)
                val night = it?.nightOnlineRate?.removeSuffix("%")?.toDouble()?.div(100)