Commit 5f5b5113 authored by 盖献康's avatar 盖献康

修改 考勤管理导出问题

parent c5ffe268
...@@ -84,7 +84,7 @@ public class AttendanceSync extends CyIdEntity<AttendanceSync> { ...@@ -84,7 +84,7 @@ public class AttendanceSync extends CyIdEntity<AttendanceSync> {
* @column off_hours * @column off_hours
* @default * @default
*/ */
@Excel(name = "下班时间", orderNum = "6", width = 20) @Excel(name = "下班时间", orderNum = "7", width = 20)
private String offHours; private String offHours;
...@@ -110,7 +110,7 @@ public class AttendanceSync extends CyIdEntity<AttendanceSync> { ...@@ -110,7 +110,7 @@ public class AttendanceSync extends CyIdEntity<AttendanceSync> {
* @column date_of_attendance * @column date_of_attendance
* @default * @default
*/ */
@Excel(name = "考勤日期", orderNum = "7", width = 20) @Excel(name = "考勤日期", orderNum = "5", width = 20)
private String dateOfAttendance; private String dateOfAttendance;
/** /**
......
...@@ -154,7 +154,7 @@ public class AttendanceSyncServiceImpl extends ServiceImpl<AttendanceSyncReposit ...@@ -154,7 +154,7 @@ public class AttendanceSyncServiceImpl extends ServiceImpl<AttendanceSyncReposit
return item; return item;
}). }).
map(item -> { map(item -> {
item.setFlag(item.getFlag().equals("0") ? "异常" : "正"); item.setFlag(item.getFlag().equals("0") ? "异常" : "正");
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return attendanceSyncList; return attendanceSyncList;
......
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