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

包头bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-01-15 14:50:54 +08:00
parent e06fb67d85
commit 760cd57881
5 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
View File

@ -455,6 +455,7 @@ public class WorkerInfo implements Serializable {
", teamId=" + teamId +
", departmentId=" + departmentId +
", payRollBankNumber='" + payRollBankNumber + '\'' +
", personMail='" + personMail + '\'' +
'}';
}

64
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -10,8 +10,6 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.*;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -155,6 +153,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
IWorkerAdmissionDetailService workerAdmissionDetailService;
@Lazy
@Autowired
MinioUtils minioUtils;
@Lazy
@Autowired
private IDictionaryItemService dictionaryItemService;
@Lazy
@Autowired
@ -425,6 +426,21 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
}
}
// public boolean check(WorkerInfo workerInfo) throws Exception {
// Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>()
// .eq(Project::getProjectSn, workerInfo.getProjectSn()));
// if (project == null) {
// throw new OpenAlertException("项目不存在");
// }
// JSONObject param = new JSONObject();
// String fieldAcquisitionUrl = workerInfo.getFieldAcquisitionUrl();
// if (StrUtil.isBlank(fieldAcquisitionUrl)) {
// throw new OpenAlertException("fieldAcquisitionUrl不能为空");
// }
// param.put("facePicBinaryData", Base64Util.convertFileToBase64(PathUtil.reviseSlash(basePath + "/" + fieldAcquisitionUrl)));
// return hikvisionCall.faceScore(project, param);
// }
/**
* 删除项目下所有人员
*
@ -448,21 +464,6 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
workerCertificateService.remove(queryWrapper3);
}
// public boolean check(WorkerInfo workerInfo) throws Exception {
// Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>()
// .eq(Project::getProjectSn, workerInfo.getProjectSn()));
// if (project == null) {
// throw new OpenAlertException("项目不存在");
// }
// JSONObject param = new JSONObject();
// String fieldAcquisitionUrl = workerInfo.getFieldAcquisitionUrl();
// if (StrUtil.isBlank(fieldAcquisitionUrl)) {
// throw new OpenAlertException("fieldAcquisitionUrl不能为空");
// }
// param.put("facePicBinaryData", Base64Util.convertFileToBase64(PathUtil.reviseSlash(basePath + "/" + fieldAcquisitionUrl)));
// return hikvisionCall.faceScore(project, param);
// }
/**
* 人员新增
*
@ -1202,10 +1203,6 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
}
}
@Lazy
@Autowired
MinioUtils minioUtils;
@Override
public void exporZipWorkerInfo(HttpServletResponse response, Map<String, Object> map) {
try {
@ -1943,7 +1940,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
workerInfo.setBirthday(MapUtils.getString(idCardInfoMap, "birthday"));
workerInfo.setPersonType(MapUtils.getInteger(importInfo, "personType"));
workerInfo.setNation(importInfo.get("民族"));
workerInfo.setPhoneNumber(importInfo.get("联系电话"));
workerInfo.setPhoneNumber(importInfo.get("*联系电话"));
workerInfo.setEmergentPerson(importInfo.get("紧急联系人"));
workerInfo.setEmergentPhone(importInfo.get("紧急联系人电话"));
workerInfo.setIssuingAuthorityForIdcard(importInfo.get("签发机构"));
@ -2013,9 +2010,10 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
workerInfo.setPayRollBankNumber(importInfo.get("银行卡号"));
workerInfo.setInserviceType(1);
workerInfo.setUfaceDevId(ufaceId);
workerInfo.setWorkArea(Optional.ofNullable(unitMap.get(importInfo.get("*工作区域"))).map(m -> m.getId()).orElse(null));
workerInfo.setNum(importInfo.get("*编号"));
workerInfo.setEntryDeadline(importInfo.get("*计划入场截止时间"));
workerInfo.setWorkArea(Optional.ofNullable(unitMap.get(importInfo.get("工作区域"))).map(m -> m.getId()).orElse(null));
workerInfo.setNum(importInfo.get("编号"));
workerInfo.setEntryDeadline(importInfo.get("计划入场截止时间"));
workerInfo.setPersonMail(importInfo.get("邮箱"));
workerInfo.setEpcCbs(Optional.ofNullable(unitMap.get(importInfo.get("EPC承包商"))).map(m -> m.getId()).orElse(null));
boolean isVaild = IdCardUtils.strongVerifyIdNumber(workerInfo.getIdCard());
if (isVaild) {
@ -2190,21 +2188,15 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
if (StringUtils.isBlank(importInfo.get("*姓名"))) {
throw new OpenAlertException("有姓名未填写");
}
if (StringUtils.isBlank(importInfo.get("*联系电话"))) {
throw new OpenAlertException("有联系电话未填写");
}
if (StringUtils.isBlank(importInfo.get("*身份证号码"))) {
throw new OpenAlertException("有身份证号码未填写");
}
if (StringUtils.isBlank(importInfo.get("*岗位(工种)"))) {
throw new OpenAlertException("有岗位(工种)未填写");
}
if (StringUtils.isBlank(importInfo.get("*工作区域"))) {
throw new OpenAlertException("有工作区域未填写");
}
if (StringUtils.isBlank(importInfo.get("*编号"))) {
throw new OpenAlertException("有编号未填写");
}
if (StringUtils.isBlank(importInfo.get("*计划入场截止时间"))) {
throw new OpenAlertException("有计划入场截止时间未填写");
}
if (StringUtils.isBlank(importInfo.get("*单位名称"))) {
throw new OpenAlertException("有单位名称未填写");
}
@ -2216,12 +2208,12 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
throw new OpenAlertException("身份证号码有重复，重复的号码为：" + StringUtils.join(repeatList));
}
//编号判重
List<String> numList = list.stream().collect(Collectors.groupingBy(m -> m.get("*编号"), Collectors.counting())).entrySet().stream().filter(key -> key.getValue() > 1).map(o -> o.getKey()).collect(Collectors.toList());
List<String> numList = list.stream().collect(Collectors.groupingBy(m -> m.get("编号"), Collectors.counting())).entrySet().stream().filter(key -> key.getValue() > 1).map(o -> o.getKey()).collect(Collectors.toList());
if (CollUtil.isNotEmpty(numList)) {
throw new OpenAlertException("编号有重复，重复的号码为：" + StringUtils.join(numList));
}
List<String> numList1 = list.stream().map(o -> o.get("*编号")).collect(Collectors.toList());
List<String> numList1 = list.stream().map(o -> o.get("编号")).collect(Collectors.toList());
List<String> cardList1 = list.stream().map(o -> o.get("*身份证号码")).collect(Collectors.toList());
List<WorkerInfo> infos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
.eq(WorkerInfo::getProjectSn, projectSn)

6
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java
View File

@ -347,8 +347,10 @@ public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzP
JSONArray value = conditions.getJSONObject(k).getJSONArray("value");
if (value != null && value.size() > 0) {
for (int z = 0; z < value.size(); z++) {
JSONObject jsonObject = value.getJSONObject(z);
orgIds.add(jsonObject.getString("id"));
if (value.get(z) instanceof JSONObject) {
JSONObject jsonObject = value.getJSONObject(z);
orgIds.add(jsonObject.getString("id"));
}
}
}
}

4
src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java
View File

@ -453,7 +453,6 @@ public class FlowSeviceUtil {
HistoricProcessInstanceQuery instanceQuery = historyService.createHistoricProcessInstanceQuery();
instanceQuery.processInstanceTenantId(TenantContextHolder.getTenantId());
Executor.builder()
.ifNotBlankNext(Objects.equals(customStatus, 1) ? "PRE_%" : null, instanceQuery::processInstanceBusinessStatusLike)
.ifNotBlankNext(Objects.equals(customStatus, 2) ? ProcessStatus.PASS.toString() : null, instanceQuery::processInstanceBusinessStatus)
.ifNotBlankNext(userId, instanceQuery::involvedUser)
// .ifNotBlankNext(startUser, instanceQuery::startedBy)
@ -474,6 +473,9 @@ public class FlowSeviceUtil {
// }
// })
;
if (Objects.equals(customStatus, 1)) {
instanceQuery.or().processInstanceBusinessStatusLike("PRE_%").unfinished().endOr();
}
instanceQuery.count();
return instanceQuery;
}

BIN
src/main/resources/excel/人员导入模板.xlsx
View File

Binary file not shown.