|
|
|
|
|
|
|
|
if(dk.getClockOut() != null){ |
|
|
if(dk.getClockOut() != null){ |
|
|
if(dk.getClockOut().isAfter(workEndTime1)){ |
|
|
if(dk.getClockOut().isAfter(workEndTime1)){ |
|
|
// 计算时间差 规定的下班打卡时间 和下班打卡时间差值 |
|
|
// 计算时间差 规定的下班打卡时间 和下班打卡时间差值 |
|
|
double Overtime = calculateOvertime(workEndTime1,dk.getClockOut(),0.5,false); |
|
|
|
|
|
|
|
|
double Overtime = calculateOvertime(workEndTime1,dk.getClockOut(),0.5,true); |
|
|
dayRecord.setGongzuori(formatOvertime(Overtime)); |
|
|
dayRecord.setGongzuori(formatOvertime(Overtime)); |
|
|
//工作日加班合计 |
|
|
//工作日加班合计 |
|
|
workOverTime = workOverTime.add(new BigDecimal(Overtime)); |
|
|
workOverTime = workOverTime.add(new BigDecimal(Overtime)); |