人员入场bug修复

This commit is contained in:
guoshengxiong 2024-10-26 18:40:44 +08:00
parent eaa72b0547
commit 5b1c38f72d

View File

@ -144,10 +144,11 @@ public class WorkerAdmissionController {
}
}
if (CollUtil.isNotEmpty(idCardList)) {
List<String> ids = idCardList.stream().map(o -> o.toString()).collect(Collectors.toList());
List<String> existDetailIdCards = workerAdmissionDetailService.list(new LambdaQueryWrapper<WorkerAdmissionDetail>()
.in(WorkerAdmissionDetail::getIdCard, idCardList).eq(WorkerAdmissionDetail::getProjectSn, projectSn)).stream().map(WorkerAdmissionDetail::getIdCard).collect(Collectors.toList());
.in(WorkerAdmissionDetail::getIdCard, ids).eq(WorkerAdmissionDetail::getProjectSn, projectSn)).stream().map(WorkerAdmissionDetail::getIdCard).collect(Collectors.toList());
List<String> existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
.in(WorkerInfo::getIdCard, idCardList).eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getIdCard).collect(Collectors.toList());
.in(WorkerInfo::getIdCard, ids).eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getIdCard).collect(Collectors.toList());
existDetailIdCards.addAll(existWorkerIdCards);
existDetailIdCards.stream().distinct();
if (CollUtil.isNotEmpty(existDetailIdCards)) {