|
@ -1126,6 +1126,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
} |
|
|
if (CollectionUtils.isNotEmpty(entities)){ |
|
|
if (CollectionUtils.isNotEmpty(entities)){ |
|
|
entities.forEach(e -> resiInfos.stream().filter(r ->r.getIdCard().equals(e.getIdCard())).forEach(r -> { |
|
|
entities.forEach(e -> resiInfos.stream().filter(r ->r.getIdCard().equals(e.getIdCard())).forEach(r -> { |
|
|
e.setGridId(r.getGridId()); |
|
|
e.setGridId(r.getGridId()); |
|
@ -1146,7 +1147,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao |
|
|
updateTripReportList(n); |
|
|
updateTripReportList(n); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
}); |
|
|
}); |
|
|
}else { |
|
|
}else { |
|
|
log.warn("未拉取到行程上报信息!"); |
|
|
log.warn("未拉取到行程上报信息!"); |
|
|