#

luxiaotao1123

2024-09-24 f532c3f25335deb1bc5ff9cd6fa712cf9b222343

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -175,13 +175,16 @@
                taskService.cancel(task.getId(), getLoginUserId());
            }
        }
        bus.setBusSts(BusStsType.CANCEL.val());
        if (0 == taskService.count(new LambdaQueryWrapper<Task>().eq(Task::getBusId, bus.getId()).eq(Task::getTaskSts, TaskStsType.COMPLETE.val()))) {
            bus.setBusSts(BusStsType.CANCEL.val());
        } else {
            bus.setBusSts(BusStsType.FINISH.val());
        }
        bus.setUpdateTime(new Date());
        bus.setUpdateBy(getLoginUserId());
        if (!busService.updateById(bus)) {
            return R.error("Cancel Fail");
        }

        return R.ok("Cancel Success");
     }