feiyu02
2025-11-14 c03e1d823eb86c856ecbe40d8d2180ffce7c7b0f
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
@@ -7,6 +7,10 @@
import cn.flightfeather.supervision.lightshare.service.DataProdBaseService
import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
import cn.flightfeather.supervision.lightshare.vo.dataprod.*
import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPEvaluateInfo
import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPInspectionInfo
import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPMonitorDataInfo
import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPSceneInfo
import org.springframework.beans.BeanUtils
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
@@ -105,8 +109,7 @@
                    }
                }
                return@queryCache res
            },
            save = {  }
            }
        )
    }
@@ -140,10 +143,10 @@
                        evaluate = it
                        val score = it.resultscorebef?.toIntOrNull() ?: -1
                        scoreLevel = when {
                            score in 0..39 -> Constant.EvaluationLevel.D.text
                            score in 40..89 -> Constant.EvaluationLevel.C.text
                            score in 90..99 -> Constant.EvaluationLevel.B.text
                            score >= 100 -> Constant.EvaluationLevel.A.text
                            score in 0..49 -> Constant.EvaluationLevel.D.text
                            score in 50..89 -> Constant.EvaluationLevel.C.text
                            score in 90..94 -> Constant.EvaluationLevel.B.text
                            score >= 95 -> Constant.EvaluationLevel.A.text
                            else -> ""
                        }
                    })
@@ -151,7 +154,6 @@
                res.sortBy { it.index }
                return@queryCache res
            },
            save = {  }
        )
    }
@@ -162,6 +164,20 @@
                val res = mutableListOf<DPInspectionInfo>()
                val subtaskList = aopDbMapper.subtaskMapper.selectByExample(Example(Subtask::class.java).apply {
                    createCriteria().andEqualTo("tguid", queryOpt.topTaskId)
                        .andEqualTo("provincecode", queryOpt.provinceCode)
                        .andEqualTo("citycode", queryOpt.cityCode)
                        .andEqualTo("districtcode", queryOpt.districtCode)
                        .apply {
//                            queryOpt.topTaskId?.let { topTaskId ->
//                                andEqualTo("tguid", topTaskId)
//                            }
                            queryOpt.startTime?.let { startTime ->
                                andGreaterThanOrEqualTo("planstarttime", startTime)
                            }
                            queryOpt.endTime?.let { endTime ->
                                andLessThanOrEqualTo("planstarttime", endTime)
                            }
                        }
                })
                if (subtaskList.isEmpty()) return@queryCache emptyList<DPInspectionInfo>()
@@ -202,7 +218,6 @@
                res.sortBy { it.index }
                return@queryCache res
            },
            save = {  }
        )
    }
@@ -233,7 +248,6 @@
                return@queryCache res
            },
            save = {  }
        )
    }
}