diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index 8451bdf..65b7e0b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -189,12 +189,13 @@ public class PmWorkerServiceImpl implements PmWorkerService{ remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); } } - //更新入场记录最新记录标识 再入场,清除最新标识 - mapper.updateEinRecordLast(record.getId()); - //已经入过场了 + if(record.getEinStatus() == 1){ + //已经入过场了 addWorkerWageCardDataAndContract(record,fileMsg); }else { + //重新入场 再入场,清除最新标识 + mapper.updateEinRecordLast(record.getId()); //换工程没换人脸 remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); addWorkerEinData(record,fileMsg); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml index b8f5533..e80680a 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml @@ -14,7 +14,6 @@ - @@ -29,11 +28,6 @@ - - - id, `name`, id_number, sex, age, phone, birthday, nation, issuing_authority, start_time, - end_time, address, face_photo, ein_status, light_status, create_user, update_user - @@ -195,9 +188,6 @@ address = #{address}, - - face_photo = #{facePhoto}, - update_user = #{updateUser},