浏览代码

1.国内模板汇总表修改

main
wangqiang 1 天前
父节点
当前提交
3244498619
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7
    2
      zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java

+ 7
- 2
zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java 查看文件

@@ -658,8 +658,13 @@ public class DkRecordServiceImpl implements DkRecordService {
dayRecord.setRbHalf(rbHalf);

// 迟到判断
if(dk.getClockIn() != null && dk.getClockOut() != null){
if(dk.getClockIn().isAfter(workStartTime1.plusMinutes(1))){
if(dk.getClockIn() != null){
if(dk.getClockIn().isAfter(workStartTime1.plusMinutes(1))&&
(dk.getClockIn().getDayOfWeek()==DayOfWeek.MONDAY||
dk.getClockIn().getDayOfWeek() == DayOfWeek.TUESDAY||
dk.getClockIn().getDayOfWeek() == DayOfWeek.WEDNESDAY||
dk.getClockIn().getDayOfWeek() == DayOfWeek.THURSDAY||
dk.getClockIn().getDayOfWeek() == DayOfWeek.FRIDAY)){
dayRecord.setChidao("●");
dayRecord.setRemark("迟到1次");
lateCount ++;

正在加载...
取消
保存