diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java index 7e0833bb48649cc09c920a0782149867385aab60..7c6ef1457c0f28d917a9fd1f23438cd1508f6162 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java @@ -82,7 +82,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { return; } - //鐗规畩鏃ユ湡鑰冨嫟閰嶇疆 List<AttendanceGroupFixedworkSpecialEntity> specialEntities = specialService.find(new AttendanceGroupFixedworkSpecialQuery().fixedWorkId(attendanceGroupFixedworkEntity.getId())); if (!ObjectUtils.isEmpty(specialEntities)) { @@ -154,8 +153,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity(); recordDetailEntity.setShiftsId(classDetailEntity.getId()); recordDetailEntity.setShiftsName(classDetailEntity.getClassName()); + recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缂哄崱.getValue()); + recordDetailEntity.setGoWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate()))); + recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缂哄崱.getValue()); + recordDetailEntity.setOffWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate()))); + recordDetailEntity.setOrderNum(orderNum); commonData.getDetailEntityList().add(recordDetailEntity); }