From 559b2e34c983f615b6d6747f52c801022c561803 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 27 十月 2025 23:05:08 +0800
Subject: [PATCH] feat: 优化任务显示列表
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleController.java
index 6d70f75..120be7a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleController.java
@@ -34,7 +34,6 @@
/**
* 鏌ヨ浠诲姟鍏宠仈鐨勮溅杈嗗垪琛�
*/
- @PreAuthorize("@ss.hasPermi('task:general:query')")
@GetMapping("/list/{taskId}")
public AjaxResult list(@PathVariable("taskId") Long taskId) {
List<SysTaskVehicle> list = sysTaskService.getTaskVehicles(taskId);
@@ -44,7 +43,6 @@
/**
* 鏌ヨ鍙敤杞﹁締鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('task:general:query')")
@GetMapping("/available")
public AjaxResult getAvailableVehicles(@RequestParam Long deptId, @RequestParam(required = false) String taskType) {
List<SysTaskVehicle> list = sysTaskService.getAvailableVehicles(deptId, taskType);
@@ -54,7 +52,6 @@
/**
* 鍒嗛厤杞﹁締缁欎换鍔�
*/
- @PreAuthorize("@ss.hasPermi('task:general:assign')")
@Log(title = "浠诲姟杞﹁締鍒嗛厤", businessType = BusinessType.INSERT)
@PostMapping("/assign/{taskId}")
public AjaxResult assignVehicle(@PathVariable("taskId") Long taskId, @RequestBody AssignVehicleRequest request) {
@@ -73,12 +70,13 @@
/**
* 鎵归噺鍒嗛厤杞﹁締缁欎换鍔�
*/
- @PreAuthorize("@ss.hasPermi('task:general:assign')")
@Log(title = "浠诲姟杞﹁締鎵归噺鍒嗛厤", businessType = BusinessType.INSERT)
@PostMapping("/assign-batch/{taskId}")
public AjaxResult assignVehicles(@PathVariable("taskId") Long taskId, @RequestBody BatchAssignVehicleRequest request) {
try {
- int result = sysTaskService.assignMultipleVehiclesToTask(taskId, request.getVehicleIds(), request.getRemark());
+ // 璁剧疆璇锋眰瀵硅薄涓殑taskId锛岀‘淇濆弬鏁颁竴鑷存��
+ request.setTaskId(taskId);
+ int result = sysTaskService.assignMultipleVehiclesToTask(request.getTaskId(), request.getVehicleIds(), request.getRemark());
if (result > 0) {
return success("鎵归噺鍒嗛厤鎴愬姛锛屽叡鍒嗛厤 " + result + " 杈嗚溅");
} else {
@@ -92,7 +90,6 @@
/**
* 鍙栨秷浠诲姟杞﹁締鍒嗛厤
*/
- @PreAuthorize("@ss.hasPermi('task:general:assign')")
@Log(title = "鍙栨秷浠诲姟杞﹁締鍒嗛厤", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskId}/{vehicleId}")
public AjaxResult unassignVehicle(@PathVariable("taskId") Long taskId, @PathVariable("vehicleId") Long vehicleId) {
@@ -136,9 +133,18 @@
* 鎵归噺鍒嗛厤杞﹁締璇锋眰瀵硅薄
*/
public static class BatchAssignVehicleRequest {
+ private Long taskId;
private List<Long> vehicleIds;
private String remark;
+ public Long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Long taskId) {
+ this.taskId = taskId;
+ }
+
public List<Long> getVehicleIds() {
return vehicleIds;
}
--
Gitblit v1.9.1