Commit c9bdcf0b by huluobin

fix

parent ffe04706
......@@ -12,6 +12,7 @@ import com.gogirl.domain.store.oa.TakeLeaveEvent;
import com.gogirl.domain.store.store.StoreManage;
import com.gogirl.domain.store.store.StoreTechnician;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.common.util.ListUtil;
import com.gogirl.infrastructure.mapper.store.*;
import com.gogirl.shared.store.command.ApplyTakeLeaveCommand;
import com.gogirl.shared.store.command.ApprovalTakeLeaveCommand;
......@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
......@@ -174,6 +176,20 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
IPage<TakeLeaveEvent> page = new Page<>(qry.getPageNum(), qry.getPageSize());
page = takeLeaveEventRepository.selectPage(page, wrapper);
if (ListUtil.isEmpty(page.getRecords())) {
return page;
}
List<Long> ids = page.getRecords().stream().map(TakeLeaveEvent::getId).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);
}
});
return page;
}
......
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