From 9b64172e24154b40ed9736dd4a004a8c035787d4 Mon Sep 17 00:00:00 2001 From: chenxu1234 <1401584727@qq.com> Date: Mon, 8 Apr 2024 23:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/kq/biz/KQOverTimeRuleCalBiz.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/engine/kq/biz/KQOverTimeRuleCalBiz.java b/src/com/engine/kq/biz/KQOverTimeRuleCalBiz.java index 1e02bc8..44b9d95 100644 --- a/src/com/engine/kq/biz/KQOverTimeRuleCalBiz.java +++ b/src/com/engine/kq/biz/KQOverTimeRuleCalBiz.java @@ -559,7 +559,9 @@ public class KQOverTimeRuleCalBiz { //如果是休班次，加班类型为休息日加班 if (isRestSerial(searIdFrom,rs)) { kqLog.info("原始across_mins:"+across_mins); - Double newHours = recalculateOverTime(divide(String.valueOf(across_mins),"60"),searIdFrom, signinDate, signinTime, signoutDate, signoutTime, rs, singleRs); + String signinTimeNew = kqTimesArrayComInfo.turn48to24Time(signinTime); + String signoutTimeNew = kqTimesArrayComInfo.turn48to24Time(signoutTime); + Double newHours = recalculateOverTime(divide(String.valueOf(across_mins),"60"),searIdFrom, signinDate, signinTimeNew, signoutDate, signoutTimeNew, rs, singleRs); across_mins = newHours.intValue()*60; kqLog.info("newHours:"+newHours+"mins:"+across_mins); } @@ -1009,7 +1011,9 @@ public class KQOverTimeRuleCalBiz { //如果是休班次，加班类型为休息日加班 if (isRestSerial(searIdFrom,rs)) { kqLog.info("原始across_mins:"+mins); - Double newHours = recalculateOverTime(divide(String.valueOf(mins),"60"),searIdFrom, signinDate, signinTime, signoutDate, signoutTime, rs, singleRs); + String signinTimeNew = kqTimesArrayComInfo.turn48to24Time(signinTime); + String signoutTimeNew = kqTimesArrayComInfo.turn48to24Time(signoutTime); + Double newHours = recalculateOverTime(divide(String.valueOf(mins),"60"),searIdFrom, signinDate, signinTimeNew, signoutDate, signoutTimeNew, rs, singleRs); mins = newHours.intValue()*60; kqLog.info("newHours:"+newHours+"mins:"+mins); }