diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java index aec7e95..1603074 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java @@ -76,7 +76,7 @@ public class BmWorkerContractServiceImpl implements BmWorkerContractService{ } List uploadFileVos = fileUploadUtils.uploadFile(workerFiles, Constants.FILE_UPLOAD_CONTRACT, record.getId().toString(), type,"", ""); } - //将合同id保存到入场表 + //将合同id保存到入场表和入场实时表 mapper.updateEinRecordContractId(record.getId(),record.getWorkerId()); return insert; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerExitServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerExitServiceImpl.java index 8e2f8e6..6cd3a91 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerExitServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerExitServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.common.core.constant.Constants; import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.system.api.RemoteUrkUtilsService; +import com.bonus.system.api.domain.SystemParamsVo; import com.bonus.system.api.model.UploadFileVo; import org.hibernate.validator.internal.util.StringHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @Service @@ -52,7 +54,6 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService { @Override public int updateWorkerExit(PmWorkerDto record, List listFile) { - //删除合同 int m = contractService.deleteByWorkerId(record.getWorkerId()); //删除实时在场 @@ -75,7 +76,6 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService { int k = mapper.updateEinProRecordStatus(record.getId(),einStatus,isUploadFile); if(k==1){ - remoteUrkUtilsService.delUserByDevice(record.getId(),record.getProId(),SecurityConstants.INNER); } return k; @@ -84,6 +84,9 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService { @Override public int updateWorkerBatchExit(List list) { int count = 0; + SystemParamsVo paramsVo = new SystemParamsVo(); + List userId = new ArrayList<>(); + List proId = new ArrayList<>(); for (PmWorkerDto bean : list) { //删除合同 int i = contractService.deleteByWorkerId(bean.getWorkerId()); @@ -94,10 +97,15 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService { int isUploadFile = 0; int k = mapper.updateEinProRecordStatus(bean.getId(),einStatus,isUploadFile); if(k==1){ - remoteUrkUtilsService.delUserByDevice(bean.getId(),bean.getProId(),SecurityConstants.INNER); + userId.add(bean.getId()); + proId.add(bean.getProId()); } count += k; } + //批量操作考勤机 + paramsVo.setUserId(userId); + paramsVo.setProId(proId); + remoteUrkUtilsService.delUserByDeviceList(paramsVo,SecurityConstants.INNER); return count==list.size()?1:0; } 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 65b7e0b..128511a 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,7 +189,6 @@ public class PmWorkerServiceImpl implements PmWorkerService{ remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); } } - if(record.getEinStatus() == 1){ //已经入过场了 addWorkerWageCardDataAndContract(record,fileMsg);