From d005f3a43c69c08a1cb014858a1dec5be6abab49 Mon Sep 17 00:00:00 2001 From: wuchuanbang Date: Mon, 11 Aug 2025 18:17:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/aircraft/modules/order/biz/OrderBiz.java | 5 ++++- .../aircraft/modules/order/domain/vo/OrderTaskDetailVO.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java index 23cca74..82e2a9e 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java @@ -458,6 +458,7 @@ public class OrderBiz { } orderTaskDetailVO.setCargoWeight(orderDetail.getCargoWeight()); EmEmployees employees = emEmployeesMap.get(orderDetail.getOperatorId()); + orderTaskDetailVO.setOperatorId(orderDetail.getOperatorId()); if (ObjectUtil.isNotNull(employees)) { orderTaskDetailVO.setOperatorName(employees.getName()); } @@ -487,12 +488,14 @@ public class OrderBiz { Map routeMap = cpRoutes.stream().collect(Collectors.toMap(CpRoute::getId, route -> route)); String[] routeIdArray = routeIds.split(StrUtil.COMMA); StringBuilder routeNameBuilder = new StringBuilder(); + List routeIdList = new ArrayList<>(); for (String routeIdStr : routeIdArray) { CpRoute cpRoute = routeMap.get(Long.valueOf(routeIdStr)); String name = cpRoute.getName(); routeNameBuilder.append(name).append(StrUtil.COMMA); - orderAllDetailVO.setRouteIds(List.of(cpRoute.getId())); + routeIdList.add(cpRoute.getId()); } + orderAllDetailVO.setRouteIds(routeIdList); // 去掉最后一个逗号 return routeNameBuilder.substring(0, routeNameBuilder.length() - 1); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java index 2152c6a..f966427 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java @@ -37,6 +37,11 @@ public class OrderTaskDetailVO { @ApiModelProperty(value = "载物重量") private BigDecimal cargoWeight; + /** + * 操作员ID + */ + @ApiModelProperty(value = "操作员ID") + private Long operatorId; /** * 操作员 */