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

feiyu02

2024-12-31 52a0c16de9b0955a5f092560b73f16e41684f97b

 src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationsubruleController.kt

@@ -1,6 +1,6 @@
package cn.flightfeather.supervision.lightshare.web

import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule
import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule2
import cn.flightfeather.supervision.lightshare.service.EvaluationsubruleService
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
@@ -15,16 +15,22 @@
    fun getAll() = evaluationsubruleService.findAll()

    @PutMapping
    fun add(@RequestBody evaluationsubrule: Evaluationsubrule) = evaluationsubruleService.save(evaluationsubrule)
    fun add(@RequestBody evaluationsubrule: Evaluationsubrule2) = evaluationsubruleService.save(evaluationsubrule)

    @PostMapping
    fun update(@RequestBody evaluationsubrule: Evaluationsubrule) = evaluationsubruleService.update(evaluationsubrule)
    fun update(@RequestBody evaluationsubrule: Evaluationsubrule2) = evaluationsubruleService.update(evaluationsubrule)

    @GetMapping("/{id}")
    fun getById(@PathVariable id: String) = evaluationsubruleService.findOne(id)

    @DeleteMapping("/{id}")
    fun delete(@PathVariable id: String) = evaluationsubruleService.delete(id)

    @ApiOperation("根据评估总规则查询下属的子规则")
    @GetMapping("/byRule")
    fun getByBaseRule(
        @ApiParam("评估总规则主键id") @RequestParam id: String
    ) = resPack { evaluationsubruleService.findByRuleId(id) }

    @ApiOperation("根据区县和场景类型查询评分子规则")
    @GetMapping("/search")
@@ -33,4 +39,10 @@
            @ApiParam("场景类型id") @RequestParam("sceneTypeId") sceneTypeId: String,
            @ApiParam(value = "评分表版本， 格式 yyyy-MM, 默认获取最新版本") @RequestParam("version") version: String?
    ) = evaluationsubruleService.search(districtCode, sceneTypeId, version)

    @ApiOperation(value = "查找巡查任务自动评估的评分细节")
    @GetMapping("/score")
    fun getAutoScore(
        @ApiParam(value = "巡查任务id") @RequestParam subTaskId: String,
    ) = resPack { evaluationsubruleService.getAutoScore(subTaskId) }
}