Commit 2d7b4153 authored by 赵啸非's avatar 赵啸非

修改固定班次考勤

parent 5f7de824
...@@ -64,7 +64,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo { ...@@ -64,7 +64,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
/** /**
* 打卡日期 * 打卡日期
*/ */
@Excel(name = "打卡日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "打卡日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date attendanceDate; private Date attendanceDate;
/** /**
* 备注 * 备注
......
...@@ -67,7 +67,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { ...@@ -67,7 +67,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
/** /**
* 考勤日期 * 考勤日期
*/ */
@Excel(name = "考勤日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "考勤日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date attendanceDate; private Date attendanceDate;
/** /**
* 考勤点名称 * 考勤点名称
......
...@@ -173,7 +173,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont ...@@ -173,7 +173,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
recordDetailEntity.setOffWorkResult(1); recordDetailEntity.setOffWorkResult(1);
} }
} else { } else {
if (item.getGoOrOff().equals("下班")) { if (item.getGoOrOff().equals("")) {
recordDetailEntity.setOffWorkResult(1); recordDetailEntity.setOffWorkResult(1);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment