From c788ca1640f080f821cb1cbe07da741302d355ef Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 02 七月 2026 14:43:08 +0800
Subject: [PATCH] Merge branch 'feature/3.0' into feature/fangxinxing
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java
index 606f8e6..949c37e 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java
@@ -108,15 +108,16 @@
@ApiOperation(value = "【202604】查询同班次其他司机信息", tags = {"司机端-首页"}, notes = "根据driverShiftId查询同lineShiftId且同day的其他司机信息")
@ApiImplicitParams({
@ApiImplicitParam(value = "司机排班记录ID", name = "driverShiftId", required = true, dataType = "long"),
+ @ApiImplicitParam(value = "订单ID（改派场景必传，多个以逗号分隔）", name = "orderIds", required = false, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OtherDriverShiftWarpper>> queryOtherDriverShiftListWithShiftId(long driverShiftId, HttpServletRequest request) {
+ public ResultUtil<List<OtherDriverShiftWarpper>> queryOtherDriverShiftListWithShiftId(long driverShiftId, String orderIds, HttpServletRequest request) {
try {
Integer driverId = driverService.getUserIdFormRedis(request);
if (null == driverId) {
return ResultUtil.tokenErr();
}
- List<OtherDriverShiftWarpper> result = lineShiftDriverService.queryOtherDriverShiftListWithShiftId(driverShiftId);
+ List<OtherDriverShiftWarpper> result = lineShiftDriverService.queryOtherDriverShiftListWithShiftId(driverShiftId, orderIds);
return ResultUtil.success(result);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1