Преглед на файлове

用户考勤,增加考勤状态和考勤时间,并通过入库进行更新

dzx преди 8 месеца
родител
ревизия
a06b394619

+ 2 - 1
src/main/java/com/xjrsoft/module/attendance/entity/AttendanceUserRelation.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -96,7 +97,7 @@ public class AttendanceUserRelation implements Serializable {
 
 
     @ApiModelProperty("最新考勤时间")
-    private Date attendanceTime;
+    private LocalDateTime attendanceTime;
 
 
 }

+ 9 - 3
src/main/java/com/xjrsoft/module/job/AttenDanceWarnNoticeTask.java

@@ -57,9 +57,6 @@ public class AttenDanceWarnNoticeTask {
     @Autowired
     private IWechatMessageLogService wechatMessageLogService;
 
-    @Autowired
-    private AttendanceUserRelationMapper userRelationMapper;
-
     @Scheduled(cron = "0 */10 * * * ?")
     public void RefreshConnectionPool() {
         String active = SpringUtil.getActiveProfile();
@@ -89,6 +86,11 @@ public class AttenDanceWarnNoticeTask {
             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);
 
@@ -111,6 +113,10 @@ public class AttenDanceWarnNoticeTask {
             if(status == 0){
                 continue;
             }
+            AttendanceUserRelation userRelation = allUserStatus.get(xjrUser.getId());
+            if(userRelation.getAttendanceTime().toLocalDate().isEqual(now.toLocalDate())){
+
+            }
 
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(xjrUser.getOpenId());