|
@@ -928,38 +928,39 @@ public class KwtTransportCommonService {
|
|
|
vo.setSettlementCycleLabel(vo.getSettlementCycle() == null ? null : settlementDictData.get(vo.getSettlementCycle().toString()));
|
|
vo.setSettlementCycleLabel(vo.getSettlementCycle() == null ? null : settlementDictData.get(vo.getSettlementCycle().toString()));
|
|
|
UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(vo.getCreateBy());
|
|
UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(vo.getCreateBy());
|
|
|
vo.setCreateByName(userCacheResDto == null ? null : userCacheResDto.getName());
|
|
vo.setCreateByName(userCacheResDto == null ? null : userCacheResDto.getName());
|
|
|
- Long lOrderId = vo.getLOrderId();
|
|
|
|
|
- List<String> loadName = new ArrayList<String>();
|
|
|
|
|
- List<String> loadAddressList = new ArrayList<String>();
|
|
|
|
|
- List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
|
|
- .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
|
|
|
|
|
- .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
|
|
|
|
|
- .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
|
|
|
|
|
- );
|
|
|
|
|
- loadAddress.forEach(address -> {
|
|
|
|
|
- loadName.add(address.getName());
|
|
|
|
|
- loadAddressList.add(address.getDetailAddress());
|
|
|
|
|
- });
|
|
|
|
|
-
|
|
|
|
|
- List<String> unloadName = new ArrayList<String>();
|
|
|
|
|
- List<String> unloadAddressList = new ArrayList<String>();
|
|
|
|
|
- List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
|
|
- .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
|
|
|
|
|
- .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
|
|
|
|
|
- .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
|
|
|
|
|
- );
|
|
|
|
|
- unloadAddress.forEach(address -> {
|
|
|
|
|
- unloadName.add(address.getName());
|
|
|
|
|
- unloadAddressList.add(address.getDetailAddress());
|
|
|
|
|
- });
|
|
|
|
|
- vo.setLoadNames(loadName);
|
|
|
|
|
- vo.setLoadAddresses(loadAddressList);
|
|
|
|
|
- vo.setUnloadNames(unloadName);
|
|
|
|
|
- vo.setUnloadAddresses(unloadAddressList);
|
|
|
|
|
- List<LoadAddressVo> loadAddressAmount = logisticsOrderAddressMapper.findByAddressAndLoadAmount(lOrderId, NumberConstant.ONE);
|
|
|
|
|
- vo.setLoading(loadAddressAmount);
|
|
|
|
|
- List<UnLoadAddressVo> unloadAddressAmount = logisticsOrderAddressMapper.findByAddressAndUnLoadAmount(lOrderId, NumberConstant.TWO);
|
|
|
|
|
- vo.setUnloading(unloadAddressAmount);
|
|
|
|
|
|
|
+ //todo 2024-03-08 11:18沟通 去掉展示订单地址信息
|
|
|
|
|
+// Long lOrderId = vo.getLOrderId();
|
|
|
|
|
+// List<String> loadName = new ArrayList<String>();
|
|
|
|
|
+// List<String> loadAddressList = new ArrayList<String>();
|
|
|
|
|
+// List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
|
|
+// .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
|
|
|
|
|
+// .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
|
|
|
|
|
+// .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
|
|
|
|
|
+// );
|
|
|
|
|
+// loadAddress.forEach(address -> {
|
|
|
|
|
+// loadName.add(address.getName());
|
|
|
|
|
+// loadAddressList.add(address.getDetailAddress());
|
|
|
|
|
+// });
|
|
|
|
|
+//
|
|
|
|
|
+// List<String> unloadName = new ArrayList<String>();
|
|
|
|
|
+// List<String> unloadAddressList = new ArrayList<String>();
|
|
|
|
|
+// List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
|
|
+// .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
|
|
|
|
|
+// .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
|
|
|
|
|
+// .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
|
|
|
|
|
+// );
|
|
|
|
|
+// unloadAddress.forEach(address -> {
|
|
|
|
|
+// unloadName.add(address.getName());
|
|
|
|
|
+// unloadAddressList.add(address.getDetailAddress());
|
|
|
|
|
+// });
|
|
|
|
|
+// vo.setLoadNames(loadName);
|
|
|
|
|
+// vo.setLoadAddresses(loadAddressList);
|
|
|
|
|
+// vo.setUnloadNames(unloadName);
|
|
|
|
|
+// vo.setUnloadAddresses(unloadAddressList);
|
|
|
|
|
+// List<LoadAddressVo> loadAddressAmount = logisticsOrderAddressMapper.findByAddressAndLoadAmount(lOrderId, NumberConstant.ONE);
|
|
|
|
|
+// vo.setLoading(loadAddressAmount);
|
|
|
|
|
+// List<UnLoadAddressVo> unloadAddressAmount = logisticsOrderAddressMapper.findByAddressAndUnLoadAmount(lOrderId, NumberConstant.TWO);
|
|
|
|
|
+// vo.setUnloading(unloadAddressAmount);
|
|
|
}
|
|
}
|
|
|
// returnList = list.stream().skip((contractParam.getPage() - 1) * contractParam.getPageSize()).limit(contractParam.getPageSize()).collect(Collectors.toList());
|
|
// returnList = list.stream().skip((contractParam.getPage() - 1) * contractParam.getPageSize()).limit(contractParam.getPageSize()).collect(Collectors.toList());
|
|
|
}
|
|
}
|