|
@@ -57,9 +57,6 @@ public class AttenDanceWarnNoticeTask {
|
|
@Autowired
|
|
@Autowired
|
|
private IWechatMessageLogService wechatMessageLogService;
|
|
private IWechatMessageLogService wechatMessageLogService;
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private AttendanceUserRelationMapper userRelationMapper;
|
|
|
|
-
|
|
|
|
@Scheduled(cron = "0 */10 * * * ?")
|
|
@Scheduled(cron = "0 */10 * * * ?")
|
|
public void RefreshConnectionPool() {
|
|
public void RefreshConnectionPool() {
|
|
String active = SpringUtil.getActiveProfile();
|
|
String active = SpringUtil.getActiveProfile();
|
|
@@ -89,6 +86,11 @@ public class AttenDanceWarnNoticeTask {
|
|
allTodyRule.put(userRelation.getUserId(), ruleDetailsMap.get(userRelation.getAttendanceRuleCategoryId()));
|
|
allTodyRule.put(userRelation.getUserId(), ruleDetailsMap.get(userRelation.getAttendanceRuleCategoryId()));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ Map<Long, AttendanceUserRelation> allUserStatus = new HashMap<>();
|
|
|
|
+ for (AttendanceUserRelation userRelation : relationList) {
|
|
|
|
+ allUserStatus.put(userRelation.getUserId(), userRelation);
|
|
|
|
+ }
|
|
|
|
+
|
|
//判断所有当前时间下,哪几条规则需要进行提醒
|
|
//判断所有当前时间下,哪几条规则需要进行提醒
|
|
Map<Long, Integer> ruleDetailsJudgeMap = judgeExecuteNotice(now, ruleDetailsList);
|
|
Map<Long, Integer> ruleDetailsJudgeMap = judgeExecuteNotice(now, ruleDetailsList);
|
|
|
|
|
|
@@ -111,6 +113,10 @@ public class AttenDanceWarnNoticeTask {
|
|
if(status == 0){
|
|
if(status == 0){
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+ AttendanceUserRelation userRelation = allUserStatus.get(xjrUser.getId());
|
|
|
|
+ if(userRelation.getAttendanceTime().toLocalDate().isEqual(now.toLocalDate())){
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
|
|
WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
|
|
WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
|
|
weChatSendMessageDto.setUserId(xjrUser.getOpenId());
|
|
weChatSendMessageDto.setUserId(xjrUser.getOpenId());
|