From 591fb57c675a1849e6e0ab1d968e1d58f6826f01 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 14:10:40 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 16 ++++++++++++++--
1 files changed, 14 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 52ad4b0..a714c47 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
@@ -11,9 +11,11 @@
import com.zy.acs.manager.manager.controller.param.BusCreateParam;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
+import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/api")
@@ -34,13 +37,22 @@
private StaService staService;
@Autowired
private LocService locService;
+ @Autowired
+ private TaskService taskService;
@PreAuthorize("hasAuthority('manager:bus:list')")
@PostMapping("/bus/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
- return R.ok().add(busService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Bus, BaseParam> page = busService.page(pageParam, pageParam.buildWrapper(true));
+ 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()));
+ }
+ }
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:bus:list')")
@@ -75,7 +87,7 @@
taskDto.setOriSta(staService.getById(dto.getOriSta()).getStaNo());
}
if (!Cools.isEmpty(dto.getOriLoc())) {
- taskDto.setOriSta(locService.getById(dto.getOriLoc()).getLocNo());
+ taskDto.setOriLoc(locService.getById(dto.getOriLoc()).getLocNo());
}
if (!Cools.isEmpty(dto.getDestSta())) {
taskDto.setDestSta(staService.getById(dto.getDestSta()).getStaNo());
--
Gitblit v1.9.1