From 5a003a42d2b34e8362910ac1d3e5a8866768e5fe Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期六, 20 十二月 2025 16:50:28 +0800
Subject: [PATCH] 2025.12.20 巡查任务统计相关功能修改
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
index 9f35c54..84412d1 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
@@ -10,6 +10,7 @@
import cn.flightfeather.supervision.lightshare.vo.TaskVo
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
+import io.swagger.annotations.ApiParam
import org.springframework.format.annotation.DateTimeFormat
import org.springframework.web.bind.annotation.*
import java.time.LocalDateTime
@@ -46,7 +47,7 @@
@ApiOperation("璋冩暣宸℃煡浠诲姟淇℃伅")
@PostMapping("/adjust")
- fun adjust(@RequestBody subtask: Subtask) = resPack { subtaskService.update(subtask) }
+ fun adjust(@RequestBody subtask: Subtask) = subtaskService.update(subtask)
@IgnoreResponseAdvice
@GetMapping("/{id}")
@@ -91,11 +92,13 @@
) = subtaskService.findByDayTaskID(dayTaskId, userId, userType)
@IgnoreResponseAdvice
+ @ApiOperation("鏍规嵁鏃堕棿鍜屽満鏅痠d鑾峰彇宸℃煡浠诲姟")
@GetMapping("/byDate")
fun findByDate(
- @RequestParam("date") date: String,
- @RequestParam("userId") userId: String,
- ) = subtaskService.findByDate(date, userId)
+ @ApiParam(value = "鏃堕棿锛屽鏋滀笉浼狅紝鍒欓粯璁よ幏鍙栨渶鏂颁竴鏈�") @RequestParam("date", required = false) date: String?,
+ @RequestParam("userId", required = false) userId: String?,
+ @ApiParam(value = "鍦烘櫙id") @RequestParam(required = false) sceneId: String?,
+ ) = subtaskService.findByDate(date, userId, sceneId)
@IgnoreResponseAdvice
@GetMapping("/getSubTask")
@@ -134,5 +137,5 @@
@PostMapping("/summary/area/problem")
fun getSummaryByArea(
@RequestBody areaVo: AreaVo,
- ) = resPack { subtaskService.getSummaryByArea(areaVo) }
+ ) = subtaskService.getSummaryByArea(areaVo)
}
\ No newline at end of file
--
Gitblit v1.9.3