admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-05-06 09:55:27 +08:00
parent 1af646dc8f
commit 55d4fb1dbd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java
View File

@ -184,9 +184,6 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl<WorkerAdmissionMappe
Long trainingEngineer = FlowUtil.getPullDownLong(map, "trainingEngineer"); Long trainingEngineer = FlowUtil.getPullDownLong(map, "trainingEngineer");
String projectSn = FlowUtil.getString(map, "projectSn"); String projectSn = FlowUtil.getString(map, "projectSn");
Date addTime = FlowUtil.getDate(map, "addTime"); Date addTime = FlowUtil.getDate(map, "addTime");
//是否需要证书
Map<Long, PostWorkType> needCertTypeMap = postWorkTypeService.list(new LambdaQueryWrapper<PostWorkType>()
.eq(PostWorkType::getProjectSn, projectSn).eq(PostWorkType::getNeedCertification, 1)).stream().collect(Collectors.toMap(PostWorkType::getId, Function.identity(), (o1, o2) -> o1));
ArrayList<WorkerAdmissionDetail> details = new ArrayList<>(); ArrayList<WorkerAdmissionDetail> details = new ArrayList<>();
ArrayList<WorkerAdmissionCertificateDetail> certificateDetails = new ArrayList<>(); ArrayList<WorkerAdmissionCertificateDetail> certificateDetails = new ArrayList<>();
ArrayList<String> successStrs = new ArrayList<>(); ArrayList<String> successStrs = new ArrayList<>();
@ -207,25 +204,24 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl<WorkerAdmissionMappe
List<String> idCards = detailsList.stream().map(o -> MapUtils.getString(((Map) o), "field4731914165560")).collect(Collectors.toList()); List<String> idCards = detailsList.stream().map(o -> MapUtils.getString(((Map) o), "field4731914165560")).collect(Collectors.toList());
List<String> readNums = detailsList.stream().map(o -> MapUtils.getString(((Map) o), "field8425114066876")).collect(Collectors.toList()); List<String> readNums = detailsList.stream().map(o -> MapUtils.getString(((Map) o), "field8425114066876")).collect(Collectors.toList());
List<String> nums = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>() List<String> nums = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
.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) { if (applyUsers.size() > 0) {
nums.remove(applyUsers.get(0).getNum()); nums.remove(applyUsers.get(0).getNum());
} }
List<String> existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>() List<String> existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
.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) { if (applyUsers.size() > 0) {
existWorkerIdCards.remove(applyUsers.get(0).getIdCard()); existWorkerIdCards.remove(applyUsers.get(0).getIdCard());
} }
existWorkerIdCards.stream().distinct(); existWorkerIdCards.stream().distinct();
for (Object o : detailsList) { for (Object o : detailsList) {
Map m = (Map) o; Map m = (Map) o;
String num = MapUtils.getString(m, "field8425114066876").trim(); String num = StrUtil.trim(MapUtils.getString(m, "field8425114066876"));
String workerName = MapUtils.getString(m, "field1767683295945"); String workerName = StrUtil.trim(MapUtils.getString(m, "field1767683295945"));
String fieldAcquisitionUrl = FlowUtil.getJSONString(m, "field3748842846403"); String fieldAcquisitionUrl = FlowUtil.getJSONString(m, "field3748842846403");
String idCardDownPhotoUrl = FlowUtil.getJSONString(m, "field9266042869571"); String idCardDownPhotoUrl = FlowUtil.getJSONString(m, "field9266042869571");
String idCardUpPhotoUrl = FlowUtil.getJSONString(m, "field4457242883981"); String idCardUpPhotoUrl = FlowUtil.getJSONString(m, "field4457242883981");
// String age = MapUtils.getString(m, "field1835750546900"); String idCard = StrUtil.trim(MapUtils.getString(m, "field4731914165560"));
String idCard = MapUtils.getString(m, "field4731914165560");
String laborContract = FlowUtil.getJSONString(m, "field6694943105066"); String laborContract = FlowUtil.getJSONString(m, "field6694943105066");
String insurance = FlowUtil.getJSONString(m, "field5226243097820"); String insurance = FlowUtil.getJSONString(m, "field5226243097820");
String examinationImage = FlowUtil.getJSONString(m, "field1194743131337"); String examinationImage = FlowUtil.getJSONString(m, "field1194743131337");