From d687c1624799a5a737af298b04ef7d9b9ea5760a Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Thu, 8 Aug 2024 10:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9F=E5=88=B0=E7=B2=BE=E7=A1=AE=E5=88=B0?=
 =?UTF-8?q?=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalAttendanceServiceImpl.java         | 6 ++++++
 .../service/impl/WorkOverTimeServiceImpl.java               | 6 +++---
 .../attendanceanalysis/web/AttendanceanalysisAction.java    | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java
index 4e7e5f8..baed647 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java
@@ -60,6 +60,9 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
             classStartTime = clcokInTimedto.getElasticTime();
         }
         int between = Utils.removeRestTime(classStartTime,clockInTime,scheduleResult,analysisDate);
+        if (between == 0){
+            return resultList;
+        }
 
         Map<String,Object> lateParams = Maps.newHashMap();
         lateParams.put("attendanceItems",attendanceItems);
@@ -219,6 +222,9 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
         }
 
         int between = Utils.removeRestTime(clockInTime,classEndTime,scheduleResult,analysisDate);
+        if (between == 0){
+            return resultList;
+        }
 
         Map<String,Object> earlyParams = Maps.newHashMap();
         earlyParams.put("attendanceItems",attendanceItems);
diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java
index b2d274b..bb9b3b3 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java
@@ -80,8 +80,8 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
             params.put("scheduleMap",scheduleMap);
             //获得加班时长以及加班开始时间和结束时间
             Map<String,Object> overTimeDuraionMap = commandExecutor.execute(new GetOvertimeDurationCmd(params));
-            String realityStartTime = overTimeDuraionMap.get("realityStartTime").toString();
-            String realityEndime = overTimeDuraionMap.get("realityEndime").toString();
+            String realityStartTime = Util.null2String(overTimeDuraionMap.get("realityStartTime"));
+            String realityEndime = Util.null2String(overTimeDuraionMap.get("realityEndime"));
             //获得加班时长以及加班开始时间和结束时间
             params.putAll(overTimeDuraionMap);
             //获得加班项目
@@ -113,7 +113,7 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
                         }
                     }
                 }
-                if (splitTime != null){
+                if (splitTime != null && !"".equals(realityStartTime) && !"".equals(realityEndime)){
                     scheduleMapList.clear();
                     //需要分割
                     Map<String,Object> beforeschedule = Maps.newHashMap();
diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
index ebad1a3..82bf6b7 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
@@ -48,8 +48,8 @@ public class AttendanceanalysisAction {
         try {
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
-//            paramMap.put("startDate","2024-07-26");
-//            paramMap.put("endDate","2024-07-26");
+//            paramMap.put("startDate","2024-07-01");
+//            paramMap.put("endDate","2024-07-01");
 //            paramMap.put("userIds","81");
 
             String startDate = Util.null2String(paramMap.get("startDate"));