|
@@ -100,7 +100,7 @@ public class AttendanceMessageTask {
|
|
|
new QueryWrapper<HolidayDate>().lambda()
|
|
|
.eq(HolidayDate::getDate, now.toLocalDate())
|
|
|
);
|
|
|
- if(holidayDate != null && holidayDate.getWay() != null && holidayDate.getWay() != 0){
|
|
|
+ if(holidayDate != null && holidayDate.getWay() != null && holidayDate.getWay() != 0 && holidayDate.getWay() != 2){
|
|
|
log.info("非工作日,不需要提醒");
|
|
|
return;
|
|
|
}
|
|
@@ -153,7 +153,7 @@ public class AttendanceMessageTask {
|
|
|
);
|
|
|
|
|
|
LocalDateTime recentlyTime = null;
|
|
|
- String characterKey = "character_string16";
|
|
|
+ String characterKey = "character_string18";
|
|
|
String wechatTemplate = weChatUtil.getAttendanceMsgLateTemplate();
|
|
|
if(messageSet.getMessageCategory() != null && messageSet.getMessageCategory() == 1){
|
|
|
wechatTemplate = weChatUtil.getAttendanceMsgLateTemplate();
|