From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwTransitRouteController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwTransitRouteController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwTransitRouteController.java
index d573a92..5bf20c9 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwTransitRouteController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwTransitRouteController.java
@@ -11,10 +11,7 @@
import com.sinata.system.domain.dto.MwTransitRouteDTO;
import com.sinata.system.domain.query.MwTransitRouteQuery;
import com.sinata.system.domain.vo.MwTransitRouteVO;
-import com.sinata.system.service.MwTransitRouteCarService;
-import com.sinata.system.service.MwTransitRoutePointsService;
-import com.sinata.system.service.MwTransitRouteService;
-import com.sinata.system.service.SysDepartmentService;
+import com.sinata.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -44,6 +41,7 @@
private final MwTransitRouteCarService transitRouteCarService;
private final MwTransitRoutePointsService pointsService;
private final SysDepartmentService departmentService;
+ private final ISysUserService userService;
/**
* 分页列表
@@ -56,14 +54,19 @@
@PostMapping("/line")
public R<List<MwTransitRoute>> line() {
//获取当前用户的车辆
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysUser sysUser1 = SecurityUtils.getLoginUser().getUser();
+ SysUser sysUser = userService.getById(sysUser1.getUserId());
Long carId = sysUser.getCarId();
//根据车辆获取线路列表
List<MwTransitRouteCar> list = transitRouteCarService.lambdaQuery().eq(MwTransitRouteCar::getCarId, carId).list();
List<Long> routeIds = new ArrayList<>();
+ for (MwTransitRouteCar mwTransitRouteCar : list) {
+ routeIds.add(mwTransitRouteCar.getRouteId());
+ }
if (routeIds.isEmpty()){
return R.ok();
}
+
List<MwTransitRoute> list1 = mwTransitRouteService.lambdaQuery().in(MwTransitRoute::getId, routeIds).list();
for (MwTransitRoute mwTransitRoute : list1) {
SysDepartment byId = departmentService.getById(mwTransitRoute.getDepartmentId());
@@ -71,16 +74,16 @@
mwTransitRoute.setHospitalName(byId.getDepartmentName());
}
}
-
return R.ok(list1);
-
}
- @ApiOperation("分页列表")
+ @ApiOperation("获取途径点")
@PostMapping("/get")
public R<List<MwTransitRoutePoints>> pageList(@RequestParam Long routeId) {
-
-
List<MwTransitRoutePoints> list1 = pointsService.lambdaQuery().eq(MwTransitRoutePoints::getRouteId, routeId).orderByAsc(MwTransitRoutePoints::getSortOrder).list();
+ for (MwTransitRoutePoints mwTransitRoutePoints : list1) {
+ SysDepartment byId = departmentService.getById(mwTransitRoutePoints.getDepartmentId());
+ mwTransitRoutePoints.setDepartmentName(byId.getDepartmentName());
+ }
return R.ok(list1);
}
--
Gitblit v1.7.1