From 4992e4e60b73a87c3781aabd9367e11e3eaa370e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 16:00:16 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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..3e01383 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
@@ -6,12 +6,13 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.OperationLog;
+import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.common.domain.*;
import com.zy.acs.manager.common.utils.BusinessSortService;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.controller.param.BusCreateParam;
-import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
+import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.BusStsType;
@@ -54,14 +55,18 @@
PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
if (hasCreateTimeDesc(pageParam.getOrders())) {
- wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
+// wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
}
PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);
+
+ long taskCompleteSts = TaskStsType.COMPLETE.val();
+ long taskCancelSts = TaskStsType.CANCEL.val();
for (Bus record : page.getRecords()) {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
if (!Cools.isEmpty(tasks)) {
record.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
- record.setTasksNum(tasks.size());
+ record.setTasksNum((int)tasks.stream().filter(task -> task.getTaskSts() != taskCompleteSts && task.getTaskSts() != taskCancelSts).count());
+ record.setTasksNumTotal(tasks.size());
}
}
return R.ok().add(page);
@@ -90,10 +95,10 @@
@PostMapping("/bus/save")
public R save(@RequestBody BusCreateParam param) {
OpenBusSubmitParam submitParam = new OpenBusSubmitParam();
- submitParam.setBatch(param.getBusNo());
+ submitParam.setBatchNo(param.getBusNo());
for (TaskIdByLongDto dto : param.getTaskList()) {
TaskDto taskDto = new TaskDto();
- taskDto.setSeqNum(dto.getSeqNum());
+ taskDto.setTaskNo(dto.getSeqNum());
taskDto.setPriority(dto.getPriority());
if (!Cools.isEmpty(dto.getOriSta())) {
taskDto.setOriSta(staService.getById(dto.getOriSta()).getStaNo());
@@ -107,7 +112,7 @@
if (!Cools.isEmpty(dto.getDestLoc())) {
taskDto.setDestLoc(locService.getById(dto.getDestLoc()).getLocNo());
}
- submitParam.getTaskList().add(taskDto);
+ submitParam.getTasks().add(taskDto);
}
Bus bus = mainService.generateBusAndTask(submitParam, param.getMemo());
return R.ok("Save Success").add(bus);
@@ -172,16 +177,19 @@
.in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val()));
if (!Cools.isEmpty(taskList)) {
for (Task task : taskList) {
- taskService.cancel(task.getId(), getLoginUserId());
+ taskService.cancel(task.getId(), getLoginUserId(), Constants.HANDLE);
}
}
- 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