diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 2b00c34ab..d26019df7 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -871,9 +871,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List pacakgeDetailExcelDTOS = EasyExcel.read(inputStream).head(PacakgeDetailExcelDTO.class).sheet(0).headRowNumber(2).doReadSync(); - Map> listMap = pacakgeDetailExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "-" + a.getTrainNumber())); + Map> listMap = pacakgeDetailExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "&" + a.getTrainNumber())); - listMap.remove("null-null"); + listMap.remove("null&null"); Set set = listMap.keySet(); List advanceDetailEntities = new ArrayList<>(); @@ -882,7 +882,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { for (String str : set) { List detailExcelDTOS = listMap.get(str); PacakgeDetailExcelDTO pacakgeDetailExcelDTO = detailExcelDTOS.get(0); - String[] split = str.split("-"); + String[] split = str.split("&"); String orderCode = split[0]; String trainNumber = split[1]; List orderPackageCodes = new ArrayList<>();