bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导出加外勤类型

This commit is contained in:
fl 2025-02-26 15:42:54 +08:00
parent 1ebd5e1626
commit 661ff7f692
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/enums/AttStatus.java
View File

@ -26,10 +26,9 @@ public enum AttStatus {
哺("22"),
节("23"),
护("24"),
其他("25")
其他("25"),
外勤("26")
;
private String code;
AttStatus(String code) {

9
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
View File

@ -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<AttDayReportBean> attDayReportList = attendanceDetailsService.getAttDayReportList(bean);
Sheet departmentSheet1 = exporter.createSheet("日报表详情");
List<String> departmentHeaders1 = Arrays.asList("序号", "考勤日期", "正常打卡人数", "迟到人数", "早退人数",
"旷工人数", "请假人数", "打卡地异常人数", "出入异常人数", "轮休人数", "临时外出人数");
"旷工人数", "请假人数", "打卡地异常人数", "出入异常人数", "轮休人数", "临时外出人数", "外勤人数");
exporter.addHeaderRowAndTitle(departmentSheet1, departmentHeaders1, title);
List<Map<String, Object>> 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<Long, String> attStatus = getStringStringMap();
@ -672,7 +675,7 @@ public class ExportFileController {
List<AttMonthReportBean> attDayReportList = attendanceDetailsService.getAttMonthReportList(bean);
Sheet departmentSheet1 = exporter.createSheet("月报表详情");
List<String> departmentHeaders1 = Arrays.asList("序号", "姓名", "所属部门", "考勤月","打卡记录", "应考勤天数", "正常打卡天数",
"迟到天数", "早退天数", "旷工天数", "请假天数", "打卡地异常天数", "出入异常天数", "轮休天数", "临时外出天数", "出差天数");
"迟到天数", "早退天数", "旷工天数", "请假天数", "打卡地异常天数", "出入异常天数", "轮休天数", "临时外出天数", "出差天数", "外勤天数");
exporter.addHeaderRowAndTitle(departmentSheet1, departmentHeaders1, title);
List<Map<String, Object>> 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<Long, String> attStatus = getStringStringMap();
if (StringHelper.isNotEmpty(bean.getStartMonth()) && StringHelper.isNotEmpty(bean.getEndMonth())) {