出场调用考勤机
This commit is contained in:
parent
b348aa6ed9
commit
879fb015f9
|
|
@ -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;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 入场状态
|
* 入场状态
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,15 @@ import com.bonus.bmw.mapper.PmWorkerExitMapper;
|
||||||
import com.bonus.bmw.service.BmWorkerContractService;
|
import com.bonus.bmw.service.BmWorkerContractService;
|
||||||
import com.bonus.bmw.service.PmWorkerExitService;
|
import com.bonus.bmw.service.PmWorkerExitService;
|
||||||
import com.bonus.common.core.constant.Constants;
|
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.common.core.web.domain.AjaxResult;
|
||||||
|
import com.bonus.system.api.RemoteUrkUtilsService;
|
||||||
import com.bonus.system.api.model.UploadFileVo;
|
import com.bonus.system.api.model.UploadFileVo;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
|
@ -24,9 +27,18 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private BmWorkerContractService contractService;
|
private BmWorkerContractService contractService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文件上传工具服务
|
||||||
|
*/
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileUploadUtils fileUploadUtils;
|
private FileUploadUtils fileUploadUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 引入urk服务 调用考勤机服务
|
||||||
|
*/
|
||||||
|
@Resource
|
||||||
|
private RemoteUrkUtilsService remoteUrkUtilsService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<PmWorker> selectWorkList(PmWorkerDto o) {
|
public List<PmWorker> selectWorkList(PmWorkerDto o) {
|
||||||
// List<PmWorker> pmWorkers = mapper.selectWorkList(o);
|
// List<PmWorker> pmWorkers = mapper.selectWorkList(o);
|
||||||
|
|
@ -60,6 +72,9 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService {
|
||||||
}
|
}
|
||||||
|
|
||||||
int k = mapper.updateEinProRecordStatus(record.getId(),einStatus,isUploadFile);
|
int k = mapper.updateEinProRecordStatus(record.getId(),einStatus,isUploadFile);
|
||||||
|
if(k==1){
|
||||||
|
remoteUrkUtilsService.delUserByDevice(record.getId(),record.getProId(),SecurityConstants.INNER);
|
||||||
|
}
|
||||||
return k;
|
return k;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -75,6 +90,9 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService {
|
||||||
//是否上传文件
|
//是否上传文件
|
||||||
int isUploadFile = 0;
|
int isUploadFile = 0;
|
||||||
int k = mapper.updateEinProRecordStatus(bean.getId(),einStatus,isUploadFile);
|
int k = mapper.updateEinProRecordStatus(bean.getId(),einStatus,isUploadFile);
|
||||||
|
if(k==1){
|
||||||
|
remoteUrkUtilsService.delUserByDevice(bean.getId(),bean.getProId(),SecurityConstants.INNER);
|
||||||
|
}
|
||||||
count += k;
|
count += k;
|
||||||
}
|
}
|
||||||
return count==list.size()?1:0;
|
return count==list.size()?1:0;
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,9 @@ public class PmWorkerServiceImpl implements PmWorkerService{
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileUploadUtils fileUploadUtils;
|
private FileUploadUtils fileUploadUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 引入urk服务 调用考勤机服务
|
||||||
|
*/
|
||||||
@Resource
|
@Resource
|
||||||
private RemoteUrkUtilsService remoteUrkUtilsService;
|
private RemoteUrkUtilsService remoteUrkUtilsService;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,9 @@
|
||||||
pw.`name`,
|
pw.`name`,
|
||||||
pw.id_number,
|
pw.id_number,
|
||||||
pw.phone,
|
pw.phone,
|
||||||
bwepr.id,
|
bwepr.id,
|
||||||
bwepr.pro_id,
|
bwepr.pro_id,
|
||||||
bwepr.pro_name,
|
bwepr.pro_name,
|
||||||
bwepr.sub_id,
|
bwepr.sub_id,
|
||||||
bwepr.sub_name,
|
bwepr.sub_name,
|
||||||
bwepr.team_id,
|
bwepr.team_id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue