Commit 791974e0 authored by 赵啸非's avatar 赵啸非

修改用户等

parent 00ae6d52
...@@ -82,7 +82,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -82,7 +82,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
return; return;
} }
//特殊日期考勤配置 //特殊日期考勤配置
List<AttendanceGroupFixedworkSpecialEntity> specialEntities = specialService.find(new AttendanceGroupFixedworkSpecialQuery().fixedWorkId(attendanceGroupFixedworkEntity.getId())); List<AttendanceGroupFixedworkSpecialEntity> specialEntities = specialService.find(new AttendanceGroupFixedworkSpecialQuery().fixedWorkId(attendanceGroupFixedworkEntity.getId()));
if (!ObjectUtils.isEmpty(specialEntities)) { if (!ObjectUtils.isEmpty(specialEntities)) {
...@@ -154,8 +153,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -154,8 +153,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity(); AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity();
recordDetailEntity.setShiftsId(classDetailEntity.getId()); recordDetailEntity.setShiftsId(classDetailEntity.getId());
recordDetailEntity.setShiftsName(classDetailEntity.getClassName()); recordDetailEntity.setShiftsName(classDetailEntity.getClassName());
recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue()); recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setGoWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate())));
recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue()); recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOffWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate())));
recordDetailEntity.setOrderNum(orderNum); recordDetailEntity.setOrderNum(orderNum);
commonData.getDetailEntityList().add(recordDetailEntity); commonData.getDetailEntityList().add(recordDetailEntity);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment