|
|
@@ -102,10 +102,17 @@ public class AttendanceMessageTask {
|
|
|
new QueryWrapper<HolidayDate>().lambda()
|
|
|
.eq(HolidayDate::getDate, now.toLocalDate())
|
|
|
);
|
|
|
+ //查询到了数据,且当天不是“普通工作日”或“需要补班的工作日”
|
|
|
if(holidayDate != null && holidayDate.getWay() != null && holidayDate.getWay() != 0 && holidayDate.getWay() != 2){
|
|
|
log.info("非工作日,不需要提醒");
|
|
|
return;
|
|
|
}
|
|
|
+ //未查询到数据
|
|
|
+ String dayOfWeek = now.getDayOfWeek().name();
|
|
|
+ if(holidayDate == null || "SUNDAY".equals(dayOfWeek) || "SATURDAY".equals(dayOfWeek)){
|
|
|
+ log.info("非工作日,不需要提醒");
|
|
|
+ return;
|
|
|
+ }
|
|
|
//查询今天的考勤规则
|
|
|
List<AttendanceRuleDetails> ruleDetails = ruleCategoryService.getTodayRules();
|
|
|
List<AttendanceMessageSet> list = messageSetService.list();
|