作业表单提交
This commit is contained in:
parent
1daaae84ff
commit
e5e5cf3c2b
@ -197,15 +197,17 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
|
|||||||
list = workerInfoMapper.selectWorkerInfoList(page, map);
|
list = workerInfoMapper.selectWorkerInfoList(page, map);
|
||||||
}
|
}
|
||||||
if (list.size() > 0) {
|
if (list.size() > 0) {
|
||||||
|
if(MapUtils.getInteger(map, "certificateType") != null) {
|
||||||
List<Long> workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList());
|
List<Long> workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList());
|
||||||
List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
|
List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
|
||||||
.in(WorkerCertificate::getWorkerId, workerIds)
|
.in(WorkerCertificate::getWorkerId, workerIds)
|
||||||
.eq(WorkerCertificate::getCertificateType, 118));
|
.eq(WorkerCertificate::getCertificateType, MapUtils.getInteger(map, "certificateType")));
|
||||||
for (WorkerInfo workerInfo : list) {
|
for (WorkerInfo workerInfo : list) {
|
||||||
List<WorkerCertificate> collect = workerCertificate.stream().filter(w -> w.getWorkerId().toString().equals(workerInfo.getId().toString())).collect(Collectors.toList());
|
List<WorkerCertificate> collect = workerCertificate.stream().filter(w -> w.getWorkerId().toString().equals(workerInfo.getId().toString())).collect(Collectors.toList());
|
||||||
workerInfo.setFireCertificate(collect.size() > 0 ? collect.get(0).getCertificateNumber() : "");
|
workerInfo.setFireCertificate(collect.size() > 0 ? collect.get(0).getCertificateNumber() : "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return page.setRecords(list);
|
return page.setRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user