Compare commits
No commits in common. "af0d5e0c4f16487af9bcc91666ee7df8bc588d7b" and "0c6bb510dfa01e2426270da1aee77fbcfcc265a0" have entirely different histories.
af0d5e0c4f
...
0c6bb510df
@ -195,8 +195,8 @@ public class ShiftResultServiceImpl extends ServiceImpl<ShiftResultMapper, Shift
|
|||||||
resultEntity.setMonth(month);
|
resultEntity.setMonth(month);
|
||||||
|
|
||||||
// 计算工作小时数
|
// 计算工作小时数
|
||||||
// int shiftHour = calculateHours(config.getBgnDtime(), config.getEndDtime());
|
int shiftHour = calculateHours(config.getBgnDtime(), config.getEndDtime());
|
||||||
resultEntity.setShiftHour(shiftsPerDay==3?8:12);
|
resultEntity.setShiftHour(shiftHour);
|
||||||
|
|
||||||
shiftResultList.add(resultEntity);
|
shiftResultList.add(resultEntity);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user