1.干线-导入数据逻辑更新

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -871,9 +871,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		List<PacakgeDetailExcelDTO> pacakgeDetailExcelDTOS = EasyExcel.read(inputStream).head(PacakgeDetailExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
 
-		Map<String, List<PacakgeDetailExcelDTO>> listMap = pacakgeDetailExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "-" + a.getTrainNumber()));
+		Map<String, List<PacakgeDetailExcelDTO>> listMap = pacakgeDetailExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "&" + a.getTrainNumber()));
 
-		listMap.remove("null-null");
+		listMap.remove("null&null");
 
 		Set<String> set = listMap.keySet();
 		List<TrunklineAdvanceDetailEntity> advanceDetailEntities = new ArrayList<>();
@@ -882,7 +882,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		for (String str : set) {
 			List<PacakgeDetailExcelDTO> 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<String> orderPackageCodes = new ArrayList<>();