From f532c3f25335deb1bc5ff9cd6fa712cf9b222343 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 15:09:01 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
index b1dbd0d..02329f3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
+++ b/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");
}
--
Gitblit v1.9.1