sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复订单详情接口

Browse Source
This commit is contained in:
wuchuanbang 2025-08-11 18:17:52 +08:00
parent bdcc6e91e3
commit d005f3a43c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
View File

@ -458,6 +458,7 @@ public class OrderBiz {
} }
orderTaskDetailVO.setCargoWeight(orderDetail.getCargoWeight()); orderTaskDetailVO.setCargoWeight(orderDetail.getCargoWeight());
EmEmployees employees = emEmployeesMap.get(orderDetail.getOperatorId()); EmEmployees employees = emEmployeesMap.get(orderDetail.getOperatorId());
orderTaskDetailVO.setOperatorId(orderDetail.getOperatorId());
if (ObjectUtil.isNotNull(employees)) { if (ObjectUtil.isNotNull(employees)) {
orderTaskDetailVO.setOperatorName(employees.getName()); orderTaskDetailVO.setOperatorName(employees.getName());
} }
@ -487,12 +488,14 @@ public class OrderBiz {
Map<Long, CpRoute> routeMap = cpRoutes.stream().collect(Collectors.toMap(CpRoute::getId, route -> route)); Map<Long, CpRoute> routeMap = cpRoutes.stream().collect(Collectors.toMap(CpRoute::getId, route -> route));
String[] routeIdArray = routeIds.split(StrUtil.COMMA); String[] routeIdArray = routeIds.split(StrUtil.COMMA);
StringBuilder routeNameBuilder = new StringBuilder(); StringBuilder routeNameBuilder = new StringBuilder();
List<Long> routeIdList = new ArrayList<>();
for (String routeIdStr : routeIdArray) { for (String routeIdStr : routeIdArray) {
CpRoute cpRoute = routeMap.get(Long.valueOf(routeIdStr)); CpRoute cpRoute = routeMap.get(Long.valueOf(routeIdStr));
String name = cpRoute.getName(); String name = cpRoute.getName();
routeNameBuilder.append(name).append(StrUtil.COMMA); 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); return routeNameBuilder.substring(0, routeNameBuilder.length() - 1);
} }

5
aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java
View File

@ -37,6 +37,11 @@ public class OrderTaskDetailVO {
@ApiModelProperty(value = "载物重量") @ApiModelProperty(value = "载物重量")
private BigDecimal cargoWeight; private BigDecimal cargoWeight;
/**
* 操作员ID
*/
@ApiModelProperty(value = "操作员ID")
private Long operatorId;
/** /**
* 操作员 * 操作员
*/ */