diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java index 80e87d1..d0729ea 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java @@ -221,6 +221,9 @@ public class AttDataDetailsBean { /** 打卡次数 */ private Integer attCount; + /**省份*/ + private String province; + /** * 角色类型 1:人资专员和管理员;2:部门考勤员,部门负责人 3:普通人员 */ 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 37222eb..d80bd6b 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 @@ -299,10 +299,27 @@ public class ExportFileController { AttStatus attStatus1 = AttStatus.getByCode(toStatus); // 根据状态码获取对应的枚举 AttStatus attStatus2 = AttStatus.getByCode(offStatus); // 根据状态码获取对应的枚举 if (attStatus1 != null) { - att.setToWorkAttStatus(attStatus1.toString()); // 将考勤状态转换为中文字符或符号 + if(att.getProvince() != null ){ + if("贵州省".equals(att.getProvince())){ + att.setToWorkAttStatus("工"); + }else{ + att.setToWorkAttStatus("外"); + } + }else{ + att.setToWorkAttStatus(attStatus1.toString()); // 将考勤状态转换为中文字符或符号 + } } if (attStatus2 != null) { - att.setOffWorkAttStatus(attStatus2.toString()); // 将考勤状态转换为中文字符或符号 + if(att.getProvince() != null ){ + if("贵州省".equals(att.getProvince())){ + att.setOffWorkAttStatus("工"); + }else{ + att.setOffWorkAttStatus("外"); + } + }else{ + att.setOffWorkAttStatus(attStatus2.toString()); // 将考勤状态转换为中文字符或符号 + } + } } // 将数据按 userId 分组存储到多个列表 diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml index 89068f4..26a942e 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml @@ -73,7 +73,8 @@ v.toWorkErrorRemake, v.offWorkAttStatus, v.offWorkAttAddress, - v.offWorkErrorRemake + v.offWorkErrorRemake, + v.province FROM v_att_update_data v LEFT JOIN sys_user su ON su.user_id = v.user_id @@ -133,7 +134,8 @@ v.toWorkErrorRemake, v.offWorkAttStatus, v.offWorkAttAddress, - v.offWorkErrorRemake + v.offWorkErrorRemake, + v.province FROM v_att_data v LEFT JOIN sys_user su ON su.user_id = v.user_id