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

项目部考勤明细导出打卡变“工”或“外”

This commit is contained in:
fl 2025-02-20 19:58:38 +08:00
parent 8f4251d31d
commit 50c07bc162
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java
View File

@ -221,6 +221,9 @@ public class AttDataDetailsBean {
/** 打卡次数 */
private Integer attCount;
/**省份*/
private String province;
/**
* 角色类型 1:人资专员和管理员;2:部门考勤员，部门负责人 3：普通人员
*/

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

@ -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 分组存储到多个列表

6
bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
View File

@ -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