Commit 6973d92a by huluobin

update

parent a3e7652a
......@@ -155,7 +155,7 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
public TakeLeaveEvent queryTakeLeave(Long id) {
TakeLeaveEvent takeLeaveEvent = takeLeaveEventRepository.selectById(id);
StoreTechnician storeTechnician = storeTechnicianRepository.selectById(takeLeaveEvent.getApplyTechnicianId());
takeLeaveEvent.setApplyStoreTechnician(storeTechnician);
takeLeaveEvent.setApplyStoreTechnicianDTO(storeTechnician);
return takeLeaveEvent;
}
......@@ -180,14 +180,14 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
if (ListUtil.isEmpty(page.getRecords())) {
return page;
}
List<Long> ids = page.getRecords().stream().map(TakeLeaveEvent::getId).collect(Collectors.toList());
List<Integer> ids = page.getRecords().stream().map(TakeLeaveEvent::getApplyTechnicianId).collect(Collectors.toList());
List<StoreTechnician> storeTechnicianList = storeTechnicianRepository.selectBatchIds(ids);
Map<Integer, List<StoreTechnician>> map = storeTechnicianList.stream().collect(Collectors.groupingBy(StoreTechnician::getId));
page.getRecords().forEach(takeLeaveEvent -> {
if (ListUtil.isNotEmpty(map.get(takeLeaveEvent.getApplyTechnicianId()))) {
StoreTechnician storeTechnician = map.get(takeLeaveEvent.getApplyTechnicianId()).stream().findAny().orElse(null);
takeLeaveEvent.setApplyStoreTechnician(storeTechnician);
takeLeaveEvent.setApplyStoreTechnicianDTO(storeTechnician);
}
});
return page;
......
......@@ -76,6 +76,9 @@ public class TakeLeaveEvent {
private Long createTime;
@TableField(exist = false)
private StoreTechnician applyStoreTechnician;
private StoreTechnician applyStoreTechnicianDTO;
@TableField(exist = false)
private String applyTechnicianName;
}
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