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

导入劳务人员bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-09-10 10:24:42 +08:00
parent eb4823bf5a
commit 5fd01c5bb5
4 changed files with 11 additions and 3 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

@ -443,7 +443,6 @@ public class WorkerInfo implements Serializable {
", emergentPerson='" + emergentPerson + '\'' +
", emergentPhone='" + emergentPhone + '\'' +
", longTerm=" + longTerm +
", inserviceType=" + inserviceType +
", personType=" + personType +
", teamId=" + teamId +
", departmentId=" + departmentId +

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
View File

@ -70,6 +70,8 @@ public interface WorkerInfoMapper extends BaseMapper<WorkerInfo> {
*/
WorkerInfo selectWorkWorkerInfoWithIdCard(@Param("idCard") String idCard, @Param("projectSn") String projectSn);
WorkerInfo selectWorkWorkerInfoWithIdCardAll(@Param("idCard") String idCard, @Param("projectSn") String projectSn);
/**
* 根据项目sn和出勤卡号查询人员信息
*

7
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -305,6 +305,13 @@
and inService_type = 1
LIMIT 1
</select>
<select id="selectWorkWorkerInfoWithIdCardAll" resultType="com.zhgd.xmgl.modules.worker.entity.WorkerInfo">
select *
from worker_info
where project_sn = #{projectSn}
and id_card = #{idCard}
LIMIT 1
</select>
<select id="selectWorkWorkerInfoWithAttendanceNumber" resultType="com.zhgd.xmgl.modules.worker.entity.WorkerInfo">
select *
from worker_info

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

@ -2061,12 +2061,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
workerInfo.setPoliticsStatus(4);
}
workerInfo.setPayRollBankNumber(importInfo.get("银行卡号"));
workerInfo.setInserviceType(1);
workerInfo.setUfaceDevId(ufaceId);
boolean isVaild = IdCardUtils.strongVerifyIdNumber(workerInfo.getIdCard());
if (isVaild) {
hasSuc = true;
WorkerInfo oldWorkerInfo = workerInfoMapper.selectWorkWorkerInfoWithIdCard(workerInfo.getIdCard(), workerInfo.getProjectSn());
WorkerInfo oldWorkerInfo = workerInfoMapper.selectWorkWorkerInfoWithIdCardAll(workerInfo.getIdCard(), workerInfo.getProjectSn());
if (oldWorkerInfo != null) {
if (oldWorkerInfo.toExistString().equals(workerInfo.toExistString())) {
existName.append(workerInfo.getWorkerName());
@ -2079,6 +2078,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
workerInfoService.editWorkerForUploadExcel(workerInfo);
} else {
String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
workerInfo.setInserviceType(1);
workerInfo.setPersonSn(uuid);
workerInfo.setAddTime(new Date());
workerInfo.setAttendanceNumber(workerInfo.getIdCard());