From a67dab8161c7428aa7cbd6f9051dd5ae77af4ed8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 19:13:41 +0800
Subject: [PATCH] fix: 修复考勤异常并验证原材料销售审批
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
index 989e1ce..d7710d0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
@@ -17,7 +17,10 @@
import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeSimpleRespVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmEmploymentTypeEnum;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
+import cn.iocoder.yudao.module.mes.api.cal.MesCalTeamApi;
+import cn.iocoder.yudao.module.mes.api.cal.dto.MesCalTeamRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -56,6 +59,8 @@
private PostApi postApi;
@Resource
private RoleApi roleApi;
+ @Resource
+ private MesCalTeamApi mesCalTeamApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鍛樺伐")
@@ -84,14 +89,12 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍛樺伐璇︽儏")
@Parameter(name = "id", description = "鍛樺伐ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:employee:query')")
public CommonResult<HrmEmployeeRespVO> getEmployee(@RequestParam("id") Long id) {
return success(employeeService.getEmployeeDetail(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍛樺伐鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:employee:query')")
public CommonResult<PageResult<HrmEmployeeRespVO>> getEmployeePage(@Valid HrmEmployeePageReqVO pageReqVO) {
PageResult<HrmEmployeeDO> pageResult = employeeService.getEmployeePage(pageReqVO);
// 杞崲涓� VO
@@ -121,7 +124,16 @@
.collect(Collectors.toSet());
Map<Long, PostRespDTO> postMap = CollUtil.isEmpty(postIds) ? Collections.emptyMap() : postApi.getPostMap(postIds);
- // 3. 鏀堕泦鎵�鏈夎鑹睮D
+ // 3. 鎵归噺鑾峰彇鐝粍淇℃伅锛堟墍灞炵彮缁勶級
+ Set<Long> teamIds = employeeList.stream()
+ .map(HrmEmployeeDO::getTeamId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ Map<Long, String> teamNameMap = CollUtil.isEmpty(teamIds) ? Collections.emptyMap() : mesCalTeamApi
+ .getTeamList(teamIds).stream()
+ .collect(Collectors.toMap(MesCalTeamRespDTO::getId, MesCalTeamRespDTO::getName, (v1, v2) -> v1));
+
+ // 4. 鏀堕泦鎵�鏈夎鑹睮D
Set<Long> allRoleIds = new HashSet<>();
for (HrmEmployeeDO employee : employeeList) {
if (StrUtil.isNotBlank(employee.getRoleIds())) {
@@ -146,6 +158,16 @@
// 濉厖宀椾綅鍚嶇О
if (employee.getPostId() != null && postMap.containsKey(employee.getPostId())) {
respVO.setPostName(postMap.get(employee.getPostId()).getName());
+ }
+
+ // 濉厖鐢ㄥ伐鎬ц川鍚嶇О
+ if (employee.getEmploymentType() != null) {
+ respVO.setEmploymentTypeName(HrmEmploymentTypeEnum.getNameByType(employee.getEmploymentType()));
+ }
+
+ // 濉厖鎵�灞炵彮缁勫悕绉�
+ if (employee.getTeamId() != null && teamNameMap.containsKey(employee.getTeamId())) {
+ respVO.setTeamName(teamNameMap.get(employee.getTeamId()));
}
// 瑙ｆ瀽 roleIds 骞跺～鍏呰鑹插悕绉�
@@ -213,4 +235,4 @@
return success(employeeService.importEmployeeList(list, importReqVO));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3