Skip to content

A
attendance-performance-platform
Commit b54cb22d authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加假日数据

parent 766376c8
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 13 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
View file @ b54cb22d
......@@ -208,21 +208,46 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
boolean goInTime = DateUtil.isIn(curDateTime, goWorkDateBefore, goWorkDateAfter);
//判断考勤时间是否在下班打卡区间内
boolean offInTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
//判断在上班与下班区间访问内 在上班的最后时间 与下班的开始时间
boolean goOffBetweenTime = DateUtil.isIn(curDateTime, goWorkDateAfter, offWorkDateBefore);
// if(goOffBetweenTime){
// //如果考勤时间在上班与下班区间内 则将考勤状态改为迟到 如果已经存在 在改为早退
// // commonData.setAttendanceStatus(AttendanceStatusEnum.LATE.getCode());
//
// }
if (goInTime == false && offInTime == false) {
// log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
continue;
log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
// continue;
}
if (goInTime) {
//如果是上班打卡区间范围,判断是否迟到
boolean inTime = DateUtil.isIn(curDateTime, goWorkDateBefore, goWorkDateAfter);
if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
}
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
}
} else {
}
// boolean inTime = DateUtil.isIn(curDateTime, goWorkDateBefore, goWorkDateAfter);
// if (inTime) {
// for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
// if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
// attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
// attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
// }
// }
// } else {
// for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
// if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
// attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
// attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
// }
// }
// }
}else{
if(goOffBetweenTime){
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
......@@ -232,22 +257,39 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
}
}
if (offInTime) {
boolean inTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setOffWorkResult(OffWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setOffWorkDate(recordHikEntity.getAttendanceDate());
}
}
/* boolean inTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setOffWorkResult(OffWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setOffWorkDate(recordHikEntity.getAttendanceDate());
}
}
} else {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkResult(OffWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkDate(recordHikEntity.getAttendanceDate());
}
}
}*/
}else{
if(goOffBetweenTime){
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()&&OffWorkResultEnum.缺卡.getValue()!=attendanceRecordDetailEntity.getGoWorkResult()) {
attendanceRecordDetailEntity.setOffWorkResult(OffWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkDate(recordHikEntity.getAttendanceDate());
}
}
}
}
}
}
......
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