Commit d89cc90d by liyanlin

fix

parent 993dc81c
......@@ -814,11 +814,26 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
List<ScheduleServe> scheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>().eq(ScheduleServe::getSchId, id));
Map<Integer, OwnProduce> ownProduceMap = ownProduceMapper.selectBatchIds(scheduleServeList.stream().map(ScheduleServe::getOwnProduceId).collect(Collectors.toList())).stream().collect(Collectors.toMap(OwnProduce::getId, a -> a, (k1, k2) -> k1));
Map<Integer, OwnProduce> ownProduceMap = ownProduceMapper.selectBatchIds(scheduleServeList.stream().map(ScheduleServe::getOwnProduceId).collect(Collectors.toList()))
.stream().collect(Collectors.toMap(OwnProduce::getId, a -> a, (k1, k2) -> k1));
Map<Integer, BaseServe> baseServeMap = baseServeService
.list(
new LambdaQueryWrapper<BaseServe>()
.in(BaseServe::getId,
scheduleServeList
.stream()
.map(ScheduleServe::getServeId)
.collect(Collectors.toList())))
.stream()
.collect(Collectors.toMap(BaseServe::getId,a -> a,(k1,k2) -> k1));
scheduleServeList.forEach(scheduleServe -> {
if (scheduleServe.getOwnProduceId() != null) {
scheduleServe.setOwnProduce(ownProduceMap.get(scheduleServe.getOwnProduceId()));
}
if(scheduleServe.getServeId() != null){
scheduleServe.setServe(baseServeMap.get(scheduleServe.getServeId()));
}
});
Set<ScheduleServe> set = new TreeSet<>(Comparator.comparing(o -> o.getSchId() + ";" + o.getServeId()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment