提交哦
parent
25aa45ba70
commit
2a2d4c42b4
|
@ -535,13 +535,58 @@ public class LabourApiController extends BaseController {
|
||||||
throw new Exception("["+i+"]"+messages);
|
throw new Exception("["+i+"]"+messages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 批量删除已保存数据
|
|
||||||
List<String> params = new ArrayList<>();
|
|
||||||
for(SurProjectAttendanceData surProjectAttendanceData:surProjectAttendanceDataList){
|
for(SurProjectAttendanceData surProjectAttendanceData:surProjectAttendanceDataList){
|
||||||
params.add(sysApplyConfig.getAppId()+"-"+surProjectAttendanceData.getServerid()+"-"+surProjectAttendanceData.getWorkerId());
|
// 查询当前班组人员考勤是否已推送
|
||||||
|
SurProjectAttendanceData findData = new SurProjectAttendanceData();
|
||||||
|
findData.setAppId(sysApplyConfig.getAppId());
|
||||||
|
findData.setWorkerId(surProjectAttendanceData.getWorkerId());
|
||||||
|
findData.setAttendanceTime(surProjectAttendanceData.getAttendanceTime());
|
||||||
|
SurProjectAttendanceData data = surProjectAttendanceDataService.findCurrentAttendanceData(findData);
|
||||||
|
if(data!=null){
|
||||||
|
//这里不能修改出勤时间
|
||||||
|
surProjectAttendanceData.setAttendanceTime(null);
|
||||||
|
surProjectAttendanceData.setAttendanceOutTime(surProjectAttendanceData.getAttendanceTime());
|
||||||
|
surProjectAttendanceData.setUpdateBy(sysApplyConfig.getAppId()+"Api推送离场");
|
||||||
|
surProjectAttendanceData.setUpdateTime(new Date());
|
||||||
|
surProjectAttendanceDataService.updateSurProjectAttendanceData(surProjectAttendanceData);
|
||||||
|
}else{
|
||||||
|
/**
|
||||||
|
* 查询人员考勤信息
|
||||||
|
*/
|
||||||
|
SurProjectAttendanceUser findUser = new SurProjectAttendanceUser();
|
||||||
|
findUser.setCfgid(sysApplyConfig.getCfgId());
|
||||||
|
findUser.setWorkerId(surProjectAttendanceData.getWorkerId());
|
||||||
|
SurProjectAttendanceUser surProjectAttendanceUser = surProjectAttendanceUserService.findCurrentAttendanceUser(findUser);
|
||||||
|
if(StringUtils.isNull(surProjectAttendanceUser)){
|
||||||
|
throw new ServiceException("未查询到人员信息",HttpStatusEnum.DARA_EXCEPTION.getCode());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNull(surProjectAttendanceUser.getCompanyTypeId())){
|
||||||
|
throw new ServiceException("人员部门类型信息不完整",HttpStatusEnum.DARA_EXCEPTION.getCode());
|
||||||
|
}
|
||||||
|
surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
|
||||||
|
surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
|
||||||
|
surProjectAttendanceData.setCompanyId(surProjectAttendanceUser.getCompanyId());
|
||||||
|
surProjectAttendanceData.setCompanyName(surProjectAttendanceUser.getCompanyName());
|
||||||
|
surProjectAttendanceData.setWorkerName(surProjectAttendanceUser.getName());
|
||||||
|
surProjectAttendanceData.setWorkerPhoto(surProjectAttendanceUser.getRecentPhoto());
|
||||||
|
surProjectAttendanceData.setWorkerGender(surProjectAttendanceUser.getGender());
|
||||||
|
surProjectAttendanceData.setBirthDate(surProjectAttendanceUser.getBirthDate());
|
||||||
|
surProjectAttendanceData.setEthnic(surProjectAttendanceUser.getEthnic());
|
||||||
|
surProjectAttendanceData.setNativePlace(surProjectAttendanceUser.getNativePlace());
|
||||||
|
surProjectAttendanceData.setPhone(surProjectAttendanceUser.getPhone());
|
||||||
|
surProjectAttendanceData.setWorkTypeName(surProjectAttendanceUser.getWorkTypeName());
|
||||||
|
surProjectAttendanceData.setSpecWorkType(surProjectAttendanceUser.getSpecWorkType());
|
||||||
|
surProjectAttendanceData.setGroupName(surProjectAttendanceUser.getGroupName());
|
||||||
|
surProjectAttendanceData.setCompanyTypeId(surProjectAttendanceUser.getCompanyTypeId());
|
||||||
|
surProjectAttendanceData.setWorkTypeCode(surProjectAttendanceUser.getWorkTypeCode());
|
||||||
|
surProjectAttendanceData.setCreateBy(sysApplyConfig.getAppId()+"Api推送入场");
|
||||||
|
surProjectAttendanceData.setCreateTime(new Date());
|
||||||
|
saveList.add(surProjectAttendanceData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotEmpty(saveList)){
|
||||||
|
surProjectAttendanceDataService.batchSurProjectAttendanceData(saveList);
|
||||||
}
|
}
|
||||||
surProjectAttendanceDataService.deleteSurProjectAttendanceDataByParams(params);
|
|
||||||
surProjectAttendanceDataService.batchSurProjectAttendanceData(saveList);
|
|
||||||
}
|
}
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode());
|
throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode());
|
||||||
|
|
Loading…
Reference in New Issue