|
@@ -884,6 +884,12 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
|
|
|
tmpUserTimeVO.setRestTimeHourStr(tmpUserTimeVO.getOverTimeHour().setScale(1,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
tmpUserTimeVO.setRestTimeDayStr(tmpUserTimeVO.getOverTimeHour().divide(new BigDecimal(allDayHours), 1, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
}
|
|
|
+ //特殊处理
|
|
|
+ if (tmpUserId.equals("8079159320355872768")) {
|
|
|
+ //火石闪信,从2023年8月1日开始计算加班工时, 老员工(李晶亚)减去21.9小时。
|
|
|
+ tmpUserTimeVO.setRestTimeHourStr(new BigDecimal(tmpUserTimeVO.getRestTimeHourStr()).subtract(new BigDecimal(21.9)).toString());
|
|
|
+ tmpUserTimeVO.setRestTimeDayStr(new BigDecimal(tmpUserTimeVO.getRestTimeDayStr()).subtract(new BigDecimal(21.9/allDayHours)).toString());
|
|
|
+ }
|
|
|
resList.add(tmpUserTimeVO);
|
|
|
}
|
|
|
httpRespMsg.setData(resList);
|