diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java index 37c182895..86c8982b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java @@ -184,9 +184,6 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl needCertTypeMap = postWorkTypeService.list(new LambdaQueryWrapper() - .eq(PostWorkType::getProjectSn, projectSn).eq(PostWorkType::getNeedCertification, 1)).stream().collect(Collectors.toMap(PostWorkType::getId, Function.identity(), (o1, o2) -> o1)); ArrayList details = new ArrayList<>(); ArrayList certificateDetails = new ArrayList<>(); ArrayList successStrs = new ArrayList<>(); @@ -207,25 +204,24 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl idCards = detailsList.stream().map(o -> MapUtils.getString(((Map) o), "field4731914165560")).collect(Collectors.toList()); List readNums = detailsList.stream().map(o -> MapUtils.getString(((Map) o), "field8425114066876")).collect(Collectors.toList()); List nums = workerInfoService.list(new LambdaQueryWrapper() - .in(WorkerInfo::getNum, readNums).eq(WorkerInfo::getProjectSn, projectSn).last(Cts.IGNORE_DATA_SCOPE_CONDITION)).stream().map(WorkerInfo::getNum).collect(Collectors.toList()); + .in(WorkerInfo::getNum, readNums).eq(WorkerInfo::getProjectSn, projectSn).last(Cts.IGNORE_DATA_SCOPE_CONDITION)).stream().map(workerInfo -> StrUtil.trim(workerInfo.getNum())).collect(Collectors.toList()); if (applyUsers.size() > 0) { nums.remove(applyUsers.get(0).getNum()); } List existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper() - .in(WorkerInfo::getIdCard, idCards).eq(WorkerInfo::getProjectSn, projectSn).last(Cts.IGNORE_DATA_SCOPE_CONDITION)).stream().map(WorkerInfo::getIdCard).collect(Collectors.toList()); + .in(WorkerInfo::getIdCard, idCards).eq(WorkerInfo::getProjectSn, projectSn).last(Cts.IGNORE_DATA_SCOPE_CONDITION)).stream().map(workerInfo -> StrUtil.trim(workerInfo.getIdCard())).collect(Collectors.toList()); if (applyUsers.size() > 0) { existWorkerIdCards.remove(applyUsers.get(0).getIdCard()); } existWorkerIdCards.stream().distinct(); for (Object o : detailsList) { Map m = (Map) o; - String num = MapUtils.getString(m, "field8425114066876").trim(); - String workerName = MapUtils.getString(m, "field1767683295945"); + String num = StrUtil.trim(MapUtils.getString(m, "field8425114066876")); + String workerName = StrUtil.trim(MapUtils.getString(m, "field1767683295945")); String fieldAcquisitionUrl = FlowUtil.getJSONString(m, "field3748842846403"); String idCardDownPhotoUrl = FlowUtil.getJSONString(m, "field9266042869571"); String idCardUpPhotoUrl = FlowUtil.getJSONString(m, "field4457242883981"); -// String age = MapUtils.getString(m, "field1835750546900"); - String idCard = MapUtils.getString(m, "field4731914165560"); + String idCard = StrUtil.trim(MapUtils.getString(m, "field4731914165560")); String laborContract = FlowUtil.getJSONString(m, "field6694943105066"); String insurance = FlowUtil.getJSONString(m, "field5226243097820"); String examinationImage = FlowUtil.getJSONString(m, "field1194743131337");