|
|
@@ -166,70 +166,70 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(8, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
staff.setClockDate(date.plusDays(-1));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(DA_YE_BAN);
|
|
|
+ staff.setAttendanceTypeName("大夜班");
|
|
|
}
|
|
|
//白班提前下班
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(17, 0))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(8, 0)));
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(17, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(BAI_BAN);
|
|
|
+ staff.setAttendanceTypeName("白班");
|
|
|
}
|
|
|
//白班异常1提前下班
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(18, 0))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(9, 0)));
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(18, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(BAI_BAN_YI_CHANG_1);
|
|
|
+ staff.setAttendanceTypeName("异常白班1");
|
|
|
}
|
|
|
//白班异常2提前下班
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(19, 0))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(10, 0)));
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(19, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(BAI_BAN_YI_CHANG_2);
|
|
|
+ staff.setAttendanceTypeName("异常白班2");
|
|
|
}
|
|
|
//中班提前下班
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(21, 0))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(13, 0)));
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(21, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(ZHONG_BAN);
|
|
|
+ staff.setAttendanceTypeName("中班");
|
|
|
}
|
|
|
//小夜班提前下班
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(0, 0))&&applyForm.getStartTime().isAfter(LocalDateTime.of(date, LocalTime.of(16, 0)))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(13, 0)));
|
|
|
staff.setClockEndTime(applyForm.getStartTime());
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(XIAO_YE_BAN);
|
|
|
+ staff.setAttendanceTypeName("小夜班");
|
|
|
}
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(1, 0))&&applyForm.getStartTime().isAfter(LocalDateTime.of(date, LocalTime.of(17, 0)))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(14, 0)));
|
|
|
staff.setClockEndTime(applyForm.getStartTime());
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(XIAO_YE_BAN_2);
|
|
|
+ staff.setAttendanceTypeName("小夜班");
|
|
|
}
|
|
|
//异常小夜班提前下班
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(22, 0))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(14, 0)));
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(22, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(XIAO_YE_BAN_YI_CHANG_1);
|
|
|
+ staff.setAttendanceTypeName("异常小夜班1");
|
|
|
}
|
|
|
else if(applyForm.getEndTime().toLocalTime().equals(LocalTime.of(23, 0))){
|
|
|
staff.setClockStartTime(LocalDateTime.of(date, LocalTime.of(15, 0)));
|
|
|
staff.setClockEndTime(LocalDateTime.of(date, LocalTime.of(23, 0)));
|
|
|
staff.setWorkHour(BigDecimal.valueOf(8).subtract(applyForm.getSumTime()));
|
|
|
- staff.setAttendanceType(TI_QIAN_XIA_BAN);
|
|
|
- staff.setAttendanceTypeName("提前下班");
|
|
|
+ staff.setAttendanceType(XIAO_YE_BAN_YI_CHANG_2);
|
|
|
+ staff.setAttendanceTypeName("异常小夜班2");
|
|
|
}
|
|
|
addList.add(staff);
|
|
|
continue;
|
|
|
@@ -607,19 +607,22 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
Integer type = staff.getAttendanceType();
|
|
|
LocalDate clockDate = staff.getClockDate();
|
|
|
String format = clockDate.format(formatter1);
|
|
|
- List<ApplyForm> applyFormList= applyFormService.getListByDate(format,userId);
|
|
|
+ List<ApplyForm> applyFormList= applyFormService.getListByDate(format,userId==null|| StringUtils.isEmpty(userId)?request.getHeader("Token"):userId);
|
|
|
|
|
|
LocalDateTime clockStartTime = staff.getClockStartTime();
|
|
|
LocalDateTime clockEndTime = staff.getClockEndTime();
|
|
|
if (clockStartTime!=null&&clockEndTime!=null) {
|
|
|
+ DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
|
|
|
LocalTime startTime = clockStartTime.toLocalTime();
|
|
|
LocalTime endTime = clockEndTime.toLocalTime();
|
|
|
+ String startStr = startTime.format(timeFormatter);
|
|
|
+ String endStr = endTime.format(timeFormatter);
|
|
|
List<HashMap<String, Object>> maplist = new ArrayList<>();
|
|
|
if (type == BAI_BAN) {
|
|
|
if (startTime.isAfter(LocalTime.of(8, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(8,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -633,7 +636,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -641,7 +644,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(17, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(17,0,0) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -656,7 +659,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "正常");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
double v = calculateOvertimeHours(LocalTime.of(17, 0), endTime);
|
|
|
if (v>0) {
|
|
|
str += "(17:00-" + endTime + "加班" + v + "小时)";
|
|
|
@@ -671,7 +674,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(13, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(13,0,0),startTime);
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -685,7 +688,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -693,7 +696,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(21, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(21,0,0));
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -707,7 +710,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", endTime + "下班考勤打卡");
|
|
|
+ map.put("msg", endStr + "下班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
double v = calculateOvertimeHours(LocalTime.of(21, 0, 0), endTime);
|
|
|
if (v > 0) {
|
|
|
@@ -721,7 +724,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(16, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(16,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -735,7 +738,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -743,7 +746,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(23, 59, 59)) && endTime.isAfter(LocalTime.of(16, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(23,59, 59) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -757,7 +760,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", endTime + "下班考勤打卡");
|
|
|
+ map.put("msg", endStr + "下班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
double v = calculateOvertimeHours(LocalTime.of(23, 59, 59), endTime);
|
|
|
if (v > 0) {
|
|
|
@@ -771,7 +774,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(17, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(17,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -785,7 +788,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -793,7 +796,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(23, 59, 59)) && endTime.isAfter(LocalTime.of(15, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(23,59, 59) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -808,7 +811,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
}else if (endTime.isBefore(LocalTime.of(1, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(1,0, 0) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -822,7 +825,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", endTime + "下班考勤打卡");
|
|
|
+ map.put("msg", endStr + "下班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
double v = calculateOvertimeHours(LocalTime.of(1, 0, 0), endTime);
|
|
|
if (v > 0) {
|
|
|
@@ -836,7 +839,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(23, 59, 59))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(23, 59, 59),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -850,7 +853,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -872,7 +875,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", endTime + "下班考勤打卡");
|
|
|
+ map.put("msg", endStr + "下班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
double v = calculateOvertimeHours(LocalTime.of(8, 0, 0), endTime);
|
|
|
if (v > 0) {
|
|
|
@@ -886,7 +889,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(9, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(9,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -900,7 +903,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -908,7 +911,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(18, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(18,0,0) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -923,7 +926,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "正常");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
double v = calculateOvertimeHours(LocalTime.of(18, 0), endTime);
|
|
|
if (v>0) {
|
|
|
str += "(18:00-" + endTime + "加班" + v + "小时)";
|
|
|
@@ -937,7 +940,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(10, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(10,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -951,7 +954,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -959,7 +962,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(19, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(19,0,0) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -974,7 +977,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "正常");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
double v = calculateOvertimeHours(LocalTime.of(19, 0), endTime);
|
|
|
if (v>0) {
|
|
|
str += "(19:00-" + endTime + "加班" + v + "小时)";
|
|
|
@@ -987,7 +990,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(14, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(14,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -1001,7 +1004,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -1009,7 +1012,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(22, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(22,0, 0) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -1023,7 +1026,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", endTime + "下班考勤打卡");
|
|
|
+ map.put("msg", endStr + "下班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
double v = calculateOvertimeHours(LocalTime.of(22, 0, 0), endTime);
|
|
|
if (v > 0) {
|
|
|
@@ -1037,7 +1040,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (startTime.isAfter(LocalTime.of(15, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "晚点");
|
|
|
- String str = startTime + "上班考勤打卡:";
|
|
|
+ String str = startStr + "上班考勤打卡:";
|
|
|
Duration duration = Duration.between(LocalTime.of(15,0,0),startTime );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -1051,7 +1054,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", startTime + "上班考勤打卡");
|
|
|
+ map.put("msg", startStr + "上班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
maplist.add(map);
|
|
|
}
|
|
|
@@ -1059,7 +1062,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
if (endTime.isBefore(LocalTime.of(23, 0, 0))) {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("res", "早退");
|
|
|
- String str = endTime + "下班考勤打卡:";
|
|
|
+ String str = endStr + "下班考勤打卡:";
|
|
|
Duration duration = Duration.between(endTime,LocalTime.of(23,0, 0) );
|
|
|
long v = duration.toMinutes();
|
|
|
if (v>0) {
|
|
|
@@ -1073,7 +1076,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
|
|
|
maplist.add(map);
|
|
|
} else {
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
- map.put("msg", endTime + "下班考勤打卡");
|
|
|
+ map.put("msg", endStr + "下班考勤打卡");
|
|
|
map.put("res", "正常");
|
|
|
double v = calculateOvertimeHours(LocalTime.of(23, 0, 0), endTime);
|
|
|
if (v > 0) {
|
yusm