1.日本模板导出 修改 显示迟到1次

2.删除模板没用的元素
3.国内模板迟到超过1分钟算迟到

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java

@@ -413,7 +413,7 @@ public class DkRecordServiceImpl implements DkRecordService {
             dayRecord.setEndTime(null != dk.getClockOut() ? dk.getClockOut().format(DateTimeFormatter.ofPattern("HH:mm:ss")) : "");
             // 迟到早退判断
             if(dk.getClockIn() != null && dk.getClockOut() != null){
-                if(dk.getClockIn().isAfter(workStartTime1)){
+                if(dk.getClockIn().isAfter(workStartTime1.plusMinutes(1))){
                     dayRecord.setChidao("●");
                     dayRecord.setRemark("迟到1次");
                     lateCount ++;
@@ -551,7 +551,7 @@ public class DkRecordServiceImpl implements DkRecordService {
             if (isLeave) {
                 DayRecord record = new DayRecord();
                 record.setNj("●");
-                record.setRemark("年假");
+                record.setRemark("年假1天");
                 fillTemplateCell(sheet, rowIndex, record);
                 njCount++;
             }
@@ -614,7 +614,8 @@ public class DkRecordServiceImpl implements DkRecordService {
 
         //根据userId获取打卡配置信息
         DkAttendanceGroup dkAttendanceGroup = dkMapper.queryConfigByUserId(dkCheckInRecordDTO.getSysUserId());
-
+        // 定义迟到次数
+        int lateCount = 0;
         // 构造excel数据
         for(DkCheckInRecordDTO dk : dkCheckInRecordDTOS){
             // 根据打卡时间获取打卡日期
@@ -650,6 +651,17 @@ public class DkRecordServiceImpl implements DkRecordService {
                                                workStartTime1, workEndTime1,
                                                lunchStartTime1, lunchEndTime1);
             dayRecord.setRbHalf(rbHalf);
+
+            // 迟到判断
+            if(dk.getClockIn() != null && dk.getClockOut() != null){
+                if(dk.getClockIn().isAfter(workStartTime1.plusMinutes(1))){
+                    dayRecord.setChidao("●");
+                    dayRecord.setRemark("迟到1次");
+                    lateCount ++;
+                }
+
+            }
+
             dayRecords.add(dayRecord);
         }
 
@@ -725,6 +737,7 @@ public class DkRecordServiceImpl implements DkRecordService {
         }
         setCellValue(sheet, rowIndex, 3, startTime);
         setCellValue(sheet, rowIndex, 4, endTime);
+        setCellValue(sheet, rowIndex, 8, record.getRemark());
     }
 
     /**