From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt index ce1b46e..7515ab9 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/EvaluationController.kt @@ -5,7 +5,9 @@ import cn.flightfeather.supervision.lightshare.vo.AreaVo import io.swagger.annotations.Api import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam import org.springframework.web.bind.annotation.* +import org.springframework.web.multipart.MultipartFile import springfox.documentation.annotations.ApiIgnore import javax.servlet.http.HttpServletResponse @@ -70,6 +72,23 @@ @ApiOperation(value = "涓嬭浇鑷姩璇勪及缁撴灉") @PostMapping("/auto/record/download") - fun downloadAutoEvaluation(@RequestBody areaVo: AreaVo, @ApiIgnore response: HttpServletResponse) = - resPack { evaluationService.downloadAutoEvaluation(areaVo, response) } + fun downloadAutoEvaluation( + @ApiParam("鍖哄煙鏉′欢淇℃伅") @RequestBody areaVo: AreaVo, + @ApiParam("鏄惁寮哄埗鐢熸垚鏂扮殑鎶ュ憡") @RequestParam forceUpdate: Boolean, + @ApiIgnore response: HttpServletResponse, + ) = resPack { evaluationService.downloadAutoEvaluation(areaVo, forceUpdate, response) } + + @ApiOperation(value = "涓嬭浇鑷姩璇勪及缁撴灉瀵煎叆妯℃澘") + @PostMapping("/auto/record/template") + fun downloadAutoEvaTemplate( + @ApiParam("鍖哄煙鏉′欢淇℃伅") @RequestBody areaVo: AreaVo, + @ApiIgnore response: HttpServletResponse, + ) = resPack { evaluationService.downloadAutoEvaTemplate(areaVo, response) } + + @ApiOperation(value = "涓婁紶鑷姩璇勪及缁撴灉") + @PutMapping("/auto/record/upload") + fun uploadAutoEvaluation( + @ApiParam("鍖哄煙鏉′欢淇℃伅") @RequestBody areaVo: AreaVo, + @ApiParam("excel鏂囦欢") @RequestPart("excel") file: MultipartFile, + ) = resPack { evaluationService.uploadAutoEvaluation(areaVo, file) } } \ No newline at end of file -- Gitblit v1.9.3