feat: 优化任务显示列表

wlzboy

2025-10-27 559b2e34c983f615b6d6747f52c801022c561803

 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;
        }