diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/enums/AttStatus.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/enums/AttStatus.java index b1b25ff..cf776d2 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/enums/AttStatus.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/enums/AttStatus.java @@ -26,10 +26,9 @@ public enum AttStatus { 哺("22"), 节("23"), 护("24"), - 其他("25") - + 其他("25"), + 外勤("26") ; - private String code; AttStatus(String code) { 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 42ae593..e7b2d61 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 @@ -300,6 +300,7 @@ public class ExportFileController { AttStatus attStatus2 = AttStatus.getByCode(offStatus); // 根据状态码获取对应的枚举 if (attStatus1 != null) { if(att.getProvince() != null ){ + //只有打卡了才会有省份 if("贵州省".equals(att.getProvince())){ att.setToWorkAttStatus("工"); }else{ @@ -528,7 +529,7 @@ public class ExportFileController { List attDayReportList = attendanceDetailsService.getAttDayReportList(bean); Sheet departmentSheet1 = exporter.createSheet("日报表详情"); List departmentHeaders1 = Arrays.asList("序号", "考勤日期", "正常打卡人数", "迟到人数", "早退人数", - "旷工人数", "请假人数", "打卡地异常人数", "出入异常人数", "轮休人数", "临时外出人数"); + "旷工人数", "请假人数", "打卡地异常人数", "出入异常人数", "轮休人数", "临时外出人数", "外勤人数"); exporter.addHeaderRowAndTitle(departmentSheet1, departmentHeaders1, title); List> departmentData1 = new ArrayList<>(); @@ -545,6 +546,7 @@ public class ExportFileController { map.put("出入异常人数", attDayReportList.get(i).getEinErrorNum()); map.put("轮休人数", attDayReportList.get(i).getRestNum()); map.put("临时外出人数", attDayReportList.get(i).getOutNum()); + map.put("外勤人数", attDayReportList.get(i).getOutsideAttNum()); departmentData1.add(map); } exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1); @@ -559,6 +561,7 @@ public class ExportFileController { headers.put("7", "临时外出"); headers.put("8", "出入异常"); headers.put("9", "打卡地异常"); + headers.put("26", "外勤详情"); //工作外出单独一个,序号不占用考勤状态 headers.put("99", "工作外出"); Map attStatus = getStringStringMap(); @@ -672,7 +675,7 @@ public class ExportFileController { List attDayReportList = attendanceDetailsService.getAttMonthReportList(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++) { @@ -693,6 +696,7 @@ public class ExportFileController { map.put("轮休天数", attDayReportList.get(i).getRestNum()); map.put("临时外出天数", attDayReportList.get(i).getOutNum()); map.put("出差天数", attDayReportList.get(i).getBusinessTripNum()); + map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum()); departmentData1.add(map); } exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1); @@ -708,6 +712,7 @@ public class ExportFileController { headers.put("8", "出入异常"); headers.put("9", "打卡地异常"); headers.put("10", "出差详情"); + headers.put("26", "外勤详情"); headers.put("99", "工作外出"); Map attStatus = getStringStringMap(); if (StringHelper.isNotEmpty(bean.getStartMonth()) && StringHelper.isNotEmpty(bean.getEndMonth())) {