diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index 92c4c8f40..e917630e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -443,7 +443,6 @@ public class WorkerInfo implements Serializable { ", emergentPerson='" + emergentPerson + '\'' + ", emergentPhone='" + emergentPhone + '\'' + ", longTerm=" + longTerm + - ", inserviceType=" + inserviceType + ", personType=" + personType + ", teamId=" + teamId + ", departmentId=" + departmentId + diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java index f9a2f5470..ad3ed51ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java @@ -70,6 +70,8 @@ public interface WorkerInfoMapper extends BaseMapper { */ WorkerInfo selectWorkWorkerInfoWithIdCard(@Param("idCard") String idCard, @Param("projectSn") String projectSn); + WorkerInfo selectWorkWorkerInfoWithIdCardAll(@Param("idCard") String idCard, @Param("projectSn") String projectSn); + /** * 根据项目sn和出勤卡号查询人员信息 * diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 24c0a674f..d1d17d439 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -305,6 +305,13 @@ and inService_type = 1 LIMIT 1 +