From 2302c9f0336f7ae4acae0583412ddc396645a0ed Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 22 十二月 2025 17:22:31 +0800
Subject: [PATCH] 2025.12.22 巡查任务统计相关功能修改
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt
index 46a83de..bffd429 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/TaskController.kt
@@ -18,7 +18,7 @@
fun save(@RequestBody task: Task) = taskService.save(task)
@PutMapping("/create")
- fun create(@RequestBody task: Task) = resPack { taskService.create(task) }
+ fun create(@RequestBody task: Task) = taskService.create(task)
@IgnoreResponseAdvice
@PostMapping
@@ -63,8 +63,9 @@
fun getDayTask(
@PathVariable("taskId") taskId: String,
@RequestParam("userId", required = false) userId: String?,
- @RequestParam("userType") userType: String
- ) = taskService.getDayTask(taskId, userId, userType)
+ @RequestParam("userType") userType: String,
+ @RequestParam(required = false) sceneTypeId: String?,
+ ) = taskService.getDayTask(taskId, userId, userType, sceneTypeId)
@IgnoreResponseAdvice
@GetMapping("/taskprogress/{userid}")
@@ -81,9 +82,9 @@
@RequestParam(value = "sceneId", required = false) sceneId: String?) = taskService.getRank(id, sceneTypeId, sceneId)
@PostMapping("/find")
- fun findTask(@RequestBody areaVo: AreaVo) = resPack { taskService.findTask(areaVo) }
+ fun findTask(@RequestBody areaVo: AreaVo) = taskService.findTask(areaVo)
@ApiOperation(value = "鑾峰彇鎬讳换鍔＄殑瀹屾垚鎯呭喌")
@PostMapping("/progress")
- fun findTaskProgress(@RequestBody areaVo: AreaVo) = resPack { taskService.findTaskProgress(areaVo) }
+ fun findTaskProgress(@RequestBody areaVo: AreaVo) = taskService.findTaskProgress(areaVo)
}
--
Gitblit v1.9.3