1. 环信码生成时，如果在线场景当期没有评估（未巡查）结果，则延用历史最新一次的结果； 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶...

feiyu02

2024-12-31 52a0c16de9b0955a5f092560b73f16e41684f97b

 src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt

@@ -9,6 +9,7 @@
import cn.flightfeather.supervision.business.autooutput.datasource.AopDataConfig
import cn.flightfeather.supervision.business.autooutput.score.AopCreditCode
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.domain.ds1.repository.SubTaskRep
import cn.flightfeather.supervision.lightshare.service.SearchService
import cn.flightfeather.supervision.lightshare.vo.ExcelConfigVo
import org.junit.Test
@@ -48,18 +49,21 @@
    @Autowired
    lateinit var jsWhDataAnalysis: JSWhDataAnalysis

    @Autowired
    lateinit var subTaskRep: SubTaskRep

    /**
     * 静安工地自评
     */
    @Test
    fun test1() {
        val taskId = "tTbZIUg7nQJ1MRgE"
        val taskId = "P7hsgDedyN9XLrbt"
        val districtCode = "310106"
        val year = 2023
        val month = 12
        val year = 2024
        val month = 6
        val sceneType = Constant.SceneType.TYPE1.value.toInt()
        jaCsDataAnalysis.setResource(taskId, sceneType, year, month)
        jaCsDataAnalysis.execute(0.124)
        jaCsDataAnalysis.execute()

        aopEvaluation.executeByTopTask(taskId, sceneType)

@@ -75,22 +79,22 @@
     */
    @Test
    fun test() {
        val taskId = "88wgq9l5gm9cUMg1"
        val districtCode = "310104"
//        val taskId = "88wgq9l5gm9cUMg1"
//        val districtCode = "310104"
        val districtName = "徐汇区"
        val year = 2023
        val year = 2024
        val month = 11
        val sceneType = Constant.SceneType.TYPE5.value.toInt()
        xhFuDataAnalysis.setResource(taskId, sceneType, year, month)
        xhFuDataAnalysis.execute()

        aopEvaluation.executeByTopTask(taskId, sceneType)

        val mode = 9
        searchService.writeToFile(ExcelConfigVo(
            taskId,
            districtCode = districtCode,
            sceneType = sceneType), mode)
//        xhFuDataAnalysis.setResource(taskId, sceneType, year, month)
//        xhFuDataAnalysis.execute()
//
//        aopEvaluation.executeByTopTask(taskId, sceneType)
//
//        val mode = 9
//        searchService.writeToFile(ExcelConfigVo(
//            taskId,
//            districtCode = districtCode,
//            sceneType = sceneType), mode)
        aopCreditCode.execute(AopDataConfig(
            year = year,
            month = month,
@@ -137,4 +141,10 @@
            districtCode = districtCode,
            sceneType = sceneType), mode)
    }

    @Test
    fun aopSubtask() {
        val s = subTaskRep.findOne("B6kyaAjJRoGJ2Yur")
        aopEvaluation.executeBySubTask(s!!)
    }
}