From 97564618d7c48cbed9b40d92d1db16436cd12414 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Tue, 8 Oct 2024 22:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E9=99=A4=E5=8A=A0=E7=8F=AD=E4=BC=91?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workovertime/GetOvertimeDurationCmd.java  | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java
index 64e61c7..d23b650 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java
@@ -271,11 +271,24 @@ public class GetOvertimeDurationCmd extends AbstractCommonCommand<Map<String, Ob
          */
         int dinnerTime = 0;
         //20240912注释下面几行代码，加班计划已经根据设置“是否扣除时间区间内的就餐休息时长”信息去除了相应时长
-//        double workflowBetweenHour = Double.valueOf(String.format("%.2f", DateUtil.getBetWeenMinutes(kssj,jssj) / 60.0));
-//        if (workflowBetweenHour <=  Double.valueOf(Util.null2String(scheduleMap.get("edxss"))) && scheduleMap.get("bdlx").equals(ClassSegmentTypeEnum.OVERTIME_PLAN.getKey())){
-//            //当为加班计划时，前台流程未扣过休息时长
-//            dinnerTime = Utils.dinnerTime(realityStartTime, realityEndime, scheduleResult, analysisDate);
-//        }
+        double workflowBetweenHour = Double.valueOf(String.format("%.2f", DateUtil.getBetWeenMinutes(kssj,jssj) / 60.0));
+        if (workflowBetweenHour <=  Double.valueOf(Util.null2String(scheduleMap.get("edxss"))) && scheduleMap.get("bdlx").equals(ClassSegmentTypeEnum.OVERTIME_PLAN.getKey())){
+            //当为加班计划时，前台流程未扣过休息时长
+            if (CheckBoxEnum.CHECKED.getKey().equals(zdkcjcxxsc)){
+                //扣除就餐段时长
+                List<Map<String, Object>> dinnerSchedule = scheduleResult.stream().filter(e ->e.get("bdlx").toString().equals(ClassSegmentTypeEnum.DINING_PERIOD.getKey())).collect(Collectors.toList());
+                dinnerTime = Utils.removeTime(kssj,jssj,dinnerSchedule,analysisDate);
+            }
+            if (CheckBoxEnum.CHECKED.getKey().equals(sfkcxxdsc)){
+                //扣除休息段时长
+                List<Map<String, Object>> restSchedule = scheduleResult.stream().filter(e ->e.get("bdlx").toString().equals(ClassSegmentTypeEnum.REST_PERIOD.getKey())).collect(Collectors.toList());
+                dinnerTime += Utils.removeTime(kssj,jssj,restSchedule,analysisDate);
+
+            }
+            if (CheckBoxEnum.CHECKED.getKey().equals(zdkcjcxxsc) && CheckBoxEnum.CHECKED.getKey().equals(sfkcxxdsc)){
+                dinnerTime = Utils.dinnerTime(realityStartTime, realityEndime, scheduleResult, analysisDate);
+            }
+        }
 
         log.debug("未扣减过的加班时长: {}", jbsc);
         log.debug("beLateTime :[{}],leaveElaryTime :[{}],askForLeaveTime:[{}],evectionTime:[{}],dinnerTime:[{}]", beLateTime, leaveElaryTime, askForLeaveTime, evectionTime, dinnerTime);