diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java index 5d01a94e5..4e0c2a10d 100644 --- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java @@ -430,17 +430,17 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService { // 判断该卸车作业节点 TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = collect.get(0); - TrunklineCarsLoadLineEntity trunklineCarsLoadLineEntity = listByLoadId.stream().filter(t -> t.getNodeName().equals(trunklineCarsLoadScanEntity.getUnloadNodeName())).findFirst().orElse(null); - - if(trunklineCarsLoadLineEntity == null || trunklineCarsLoadLineEntity.getArriveDate()== null){ - return null; - } +// TrunklineCarsLoadLineEntity trunklineCarsLoadLineEntity = listByLoadId.stream().filter(t -> t.getNodeName().equals(trunklineCarsLoadScanEntity.getUnloadNodeName())).findFirst().orElse(null); +// +// if(trunklineCarsLoadLineEntity == null || trunklineCarsLoadLineEntity.getArriveDate()== null){ +// return null; +// } NodeInfoVO nodeInfoVO = new NodeInfoVO(); nodeInfoVO.setOperateName("干线到达"); nodeInfoVO.setOperateNumber(collect.size() + ""); nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getUnloadNodeName()); - nodeInfoVO.setOperateTime(trunklineCarsLoadLineEntity.getArriveDate()); + nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getUnloadTime()); return nodeInfoVO; }