Browse Source

考勤模块调整

dzx 5 months ago
parent
commit
160a830b15

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

@@ -253,19 +253,19 @@ public class AttenDanceWarnNoticeTask {
                     && ruleDetail.getIsAttendance() != null && ruleDetail.getIsAttendance() == 1){
                 if(ruleDetail.getAmStartTime() != null){
                     LocalDateTime amStartTime = now.with(ruleDetail.getAmStartTime().toLocalTime());
-                    result.add(amStartTime.plusDays(- ruleDetail.getAgoMinutes()));
-                    result.add(amStartTime.plusDays(ruleDetail.getOverMinutes()));
+                    result.add(amStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
+                    result.add(amStartTime.plusMinutes(ruleDetail.getOverMinutes()));
                 }
                 if(ruleDetail.getPmStartTime() != null){
                     LocalDateTime pmStartTime = now.with(ruleDetail.getPmStartTime().toLocalTime());
-                    result.add(pmStartTime.plusDays(- ruleDetail.getAgoMinutes()));
-                    result.add(pmStartTime.plusDays(ruleDetail.getOverMinutes()));
+                    result.add(pmStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
+                    result.add(pmStartTime.plusMinutes(ruleDetail.getOverMinutes()));
                 }
 
                 if(ruleDetail.getEveningStartTime() != null){
                     LocalDateTime eveningStartTime = now.with(ruleDetail.getEveningStartTime().toLocalTime());
-                    result.add(eveningStartTime.plusDays(- ruleDetail.getAgoMinutes()));
-                    result.add(eveningStartTime.plusDays(ruleDetail.getOverMinutes()));
+                    result.add(eveningStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
+                    result.add(eveningStartTime.plusMinutes(ruleDetail.getOverMinutes()));
                 }
             }
         }