shilei
/
weaver-ningbojinghua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
nb0402
chenxu1234 1 year ago
parent 5d3a17b3b7
commit 9b64172e24
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File

8
src/com/engine/kq/biz/KQOverTimeRuleCalBiz.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save