diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java index a06bb9b..547253e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java @@ -173,7 +173,7 @@ public class AttDetailByMonthController extends BaseController { List attDayReportList = attDetailByMonthService.selectAttDetailList(bean); Sheet departmentSheet1 = exporter.createSheet("月异常报表详情"); List departmentHeaders1 = Arrays.asList("序号", "姓名", "所属部门", "考勤月","打卡记录", "应考勤天数", "正常打卡天数", - "迟到天数", "早退天数", "旷工天数", "打卡地异常天数", "出入异常天数"); + "迟到天数", "早退天数", "旷工天数", "打卡地异常天数", "出入异常天数", "外勤天数"); exporter.addHeaderRowAndTitle(departmentSheet1, departmentHeaders1, title); List> departmentData1 = new ArrayList<>(); for (int i = 0; i < attDayReportList.size(); i++) { @@ -190,6 +190,7 @@ public class AttDetailByMonthController extends BaseController { map.put("旷工天数", attDayReportList.get(i).getSkippingNum()); map.put("打卡地异常天数", attDayReportList.get(i).getAddressErrorNum()); map.put("出入异常天数", attDayReportList.get(i).getEinErrorNum()); + map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum()); departmentData1.add(map); } exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1); @@ -204,6 +205,7 @@ public class AttDetailByMonthController extends BaseController { headers.put("7", "临时外出"); headers.put("8", "出入异常"); headers.put("9", "打卡地异常"); + headers.put("26", "外勤详情"); headers.put("99", "工作外出"); Map attStatus = getStringStringMap(); if (StringHelper.isNotEmpty(bean.getStartMonth()) && StringHelper.isNotEmpty(bean.getEndMonth())) {