bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
马三炮 2025-08-18 11:28:54 +08:00
parent bb8888cbca 879fb015f9
commit 37bf2efaa1
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java
View File

@ -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;
/**
* 入场状态

18
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerExitServiceImpl.java
View File

@ -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<PmWorker> selectWorkList(PmWorkerDto o) {
// List<PmWorker> 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;

3
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
View File

@ -43,6 +43,9 @@ public class PmWorkerServiceImpl implements PmWorkerService{
@Autowired
private FileUploadUtils fileUploadUtils;
/**
* 引入urk服务 调用考勤机服务
*/
@Resource
private RemoteUrkUtilsService remoteUrkUtilsService;

6
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml
View File

@ -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,