From e2db2fbe608897f1c3903086938a8b55c24929db Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Thu, 17 Oct 2024 14:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=8F=AD=E6=97=B6=E9=95=BF=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/workovertime/SaveWorkOverTimeCmd.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java
index 8657c12..2216916 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java
@@ -155,8 +155,8 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         log.debug("最终加班时长: {}",jbsc);
         workOverTimeItems.put("item",workTimeBeLateItems.get(0).get("key"));
         //20240914逻辑修改，加班转调休中，加班时长、转入假期时长不进行核算量相关逻辑处理
-//        double itemduration = Utils.getItemdurationDown(workOverTimeHsl,workOverTimeHsdw,Long.valueOf(Math.round(jbsc)).intValue(),AccountingUnitEnum.MINUTES);
-        double itemduration = Utils.getItemdurationDownWithoutHsl(workOverTimeHsdw,Long.valueOf(Math.round(jbsc)).intValue(),AccountingUnitEnum.MINUTES);
+        double itemduration = Utils.getItemdurationDown(workOverTimeHsl,workOverTimeHsdw,Long.valueOf(Math.round(jbsc)).intValue(),AccountingUnitEnum.MINUTES);
+       // double itemduration = Utils.getItemdurationDownWithoutHsl(workOverTimeHsdw,Long.valueOf(Math.round(jbsc)).intValue(),AccountingUnitEnum.MINUTES);
         workOverTimeItems.put("itemduration",itemduration);
         workOverTimeItems.put("jbsc",jbsc);
 
@@ -203,8 +203,8 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
             Map<String,Object> holidayItem = getHolidayItem(workTimeBeLateItems.get(0).get("zrdjb").toString(),attendanceItems);
             //20240914逻辑修改，加班转调休中，加班时长、转入假期时长不进行核算量相关逻辑处理
 //            double ktsc = Utils.getItemdurationDown(Double.valueOf(holidayItem.get("hsl").toString()),holidayItem.get("hsdw").toString(),Double.valueOf(jbsc).intValue(),AccountingUnitEnum.MINUTES);
-            double ktsc = Utils.getItemdurationDownWithoutHsl(holidayItem.get("hsdw").toString(),Double.valueOf(jbsc).intValue(),AccountingUnitEnum.MINUTES);
-
+           // double ktsc = Utils.getItemdurationDownWithoutHsl(holidayItem.get("hsdw").toString(),Double.valueOf(jbsc).intValue(),AccountingUnitEnum.MINUTES);
+            double ktsc = itemduration;
             insertHoliDayParam.put("ktsc",ktsc);
             insertHoliDayParam.put("yxsc",0);
             insertHoliDayParam.put("wxsc",ktsc);