扣除加班休息时长

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);