From 879fb015f9121674f76c8a1c14c6cc8b4739cc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Mon, 18 Aug 2025 11:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=9C=BA=E8=B0=83=E7=94=A8=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/bmw/domain/dto/PmWorkerDto.java | 8 ++++---- .../service/impl/PmWorkerExitServiceImpl.java | 18 ++++++++++++++++++ .../bmw/service/impl/PmWorkerServiceImpl.java | 3 +++ .../mapper/bmw/PmWorkerExitMapper.xml | 6 +++--- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java index 1b37dec..c3fa640 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java @@ -32,20 +32,20 @@ public class PmWorkerDto { /** * 项目名称 */ - private String proId; + private Integer proId; /** * 分包名称 */ - private String subId; + private Integer subId; /** * 班组名称 */ - private String teamId; + private Integer teamId; /** * 岗位名称 */ - private String postId; + private Integer postId; /** * 入场状态 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 8eadd3e..d28dad8 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 @@ -7,12 +7,15 @@ import com.bonus.bmw.mapper.PmWorkerExitMapper; import com.bonus.bmw.service.BmWorkerContractService; import com.bonus.bmw.service.PmWorkerExitService; 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.model.UploadFileVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.util.List; @Service @@ -24,9 +27,18 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService { @Autowired private BmWorkerContractService contractService; + /** + * 文件上传工具服务 + */ @Autowired private FileUploadUtils fileUploadUtils; + /** + * 引入urk服务 调用考勤机服务 + */ + @Resource + private RemoteUrkUtilsService remoteUrkUtilsService; + @Override public List selectWorkList(PmWorkerDto o) { // List pmWorkers = mapper.selectWorkList(o); @@ -60,6 +72,9 @@ 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; } @@ -75,6 +90,9 @@ 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); + } count += k; } 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 449be80..8a6b624 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 @@ -43,6 +43,9 @@ public class PmWorkerServiceImpl implements PmWorkerService{ @Autowired private FileUploadUtils fileUploadUtils; + /** + * 引入urk服务 调用考勤机服务 + */ @Resource private RemoteUrkUtilsService remoteUrkUtilsService; diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml index f197501..6ed52b0 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml @@ -28,9 +28,9 @@ pw.`name`, pw.id_number, pw.phone, - bwepr.id, - bwepr.pro_id, - bwepr.pro_name, + bwepr.id, + bwepr.pro_id, + bwepr.pro_name, bwepr.sub_id, bwepr.sub_name, bwepr.team_id,