diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java index a60c891..08d4b8c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java @@ -677,7 +677,7 @@ public class ExportFileController { dayTable.setAttStatis(Integer.parseInt(entry.getKey())); List list = attDetailByMonthService.getDetailList(dayTable); Sheet departmentSheet2 = exporter.createSheet(entry.getValue()); - List departmentHeaders2 = Arrays.asList("序号", "姓名", "所属部门", "考勤日期", "上班打卡时间", "上班状态", "打卡地址", "下班打卡时间", "下班状态", "打卡地址"); + List departmentHeaders2 = Arrays.asList("序号", "姓名", "所属部门", "考勤日期", "上班打卡时间", "上班状态", "上班打卡地址", "下班打卡时间", "下班状态", "下班打卡地址"); exporter.addHeaderRowAndTitle(departmentSheet2, departmentHeaders2, title); List> departmentData2 = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { @@ -688,7 +688,7 @@ public class ExportFileController { map.put("考勤日期", list.get(i).getAttCurrent()); map.put("上班打卡时间", list.get(i).getGoWorkTime()); map.put("上班状态", attStatus.get(String.valueOf(list.get(i).getGoWorkStatus()))); - map.put("上班打卡地址", list.get(i).getOffWorkAddress()); + map.put("上班打卡地址", list.get(i).getGoWorkAddress()); map.put("下班打卡时间", list.get(i).getOffWorkTime()); map.put("下班状态", attStatus.get(String.valueOf(list.get(i).getOffWorkStatus()))); map.put("下班打卡地址", list.get(i).getOffWorkAddress());