renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改员工导出bug及大屏睡眠人数

Browse Source
This commit is contained in:
wanghao
2026-01-05 15:22:16 +08:00
parent fb699c5227
commit de888296d9
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java
+6 -1
View File
@@ -1111,7 +1111,12 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
if (Objects.nonNull(userEmployee.getSecondDepart())) {
userEmployeeVo.setUnit(userEmployee.getSecondDepart().getDepartName());
}
//部门
//三级部门
if (Objects.nonNull(userEmployee.getOrgCode())) {
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(userEmployee.getOrgCode()));
userEmployeeVo.setThreeDepart(thirdDepart.getDepartName());
}
//四级部门
if (Objects.nonNull(userEmployee.getDepart())) {
userEmployeeVo.setDepart(userEmployee.getDepart().getDepartName());
}
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserEmployeeVo.java
+3 -1
View File
@@ -23,7 +23,9 @@ public class UserEmployeeVo implements Serializable {
private String idCard;
@Excel(name = "单位（必填）", width = 15)
private String unit;
@Excel(name = "部门（必填）", width = 18)
@Excel(name = "部门名称（必填）", width = 18)
private String threeDepart;
@Excel(name = "四级部门名称（必填）", width = 18)
private String depart;
@Excel(name = "出生日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")