From d37c463e8dcdc72edf992f8c010b5c9037a3dceb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 15:52:50 +0800
Subject: [PATCH] feat(hrm): 社保公积金方案支持按部门绑定，修比例输入精度
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java
index caf71d4..a766dcf 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java
@@ -1,11 +1,14 @@
package cn.iocoder.yudao.module.hrm.controller.admin.salary;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSocialSecuritySchemeRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSocialSecuritySchemeSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmSocialSecuritySchemeDO;
import cn.iocoder.yudao.module.hrm.service.salary.HrmSocialSecuritySchemeService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,7 +18,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -28,20 +34,21 @@
@Resource
private HrmSocialSecuritySchemeService schemeService;
+ @Resource
+ private DeptApi deptApi;
+
@PostMapping("/create")
@Operation(summary = "鍒涘缓绀句繚鍏Н閲戞柟妗�")
@PreAuthorize("@ss.hasPermission('hrm:social-security:create')")
public CommonResult<Long> createScheme(@Valid @RequestBody HrmSocialSecuritySchemeSaveReqVO createReqVO) {
- HrmSocialSecuritySchemeDO scheme = BeanUtils.toBean(createReqVO, HrmSocialSecuritySchemeDO.class);
- return success(schemeService.createScheme(scheme));
+ return success(schemeService.createScheme(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊绀句繚鍏Н閲戞柟妗�")
@PreAuthorize("@ss.hasPermission('hrm:social-security:update')")
public CommonResult<Boolean> updateScheme(@Valid @RequestBody HrmSocialSecuritySchemeSaveReqVO updateReqVO) {
- HrmSocialSecuritySchemeDO scheme = BeanUtils.toBean(updateReqVO, HrmSocialSecuritySchemeDO.class);
- schemeService.updateScheme(scheme);
+ schemeService.updateScheme(updateReqVO);
return success(true);
}
@@ -60,7 +67,13 @@
@PreAuthorize("@ss.hasPermission('hrm:social-security:query')")
public CommonResult<HrmSocialSecuritySchemeRespVO> getScheme(@RequestParam("id") Long id) {
HrmSocialSecuritySchemeDO scheme = schemeService.getScheme(id);
- return success(BeanUtils.toBean(scheme, HrmSocialSecuritySchemeRespVO.class));
+ if (scheme == null) {
+ return success(null);
+ }
+ HrmSocialSecuritySchemeRespVO respVO = BeanUtils.toBean(scheme, HrmSocialSecuritySchemeRespVO.class);
+ // 濉厖閫傜敤閮ㄩ棬
+ fillDeptInfo(List.of(respVO));
+ return success(respVO);
}
@GetMapping("/list")
@@ -70,7 +83,34 @@
public CommonResult<List<HrmSocialSecuritySchemeRespVO>> getSchemeList(
@RequestParam(value = "status", required = false) Integer status) {
List<HrmSocialSecuritySchemeDO> list = schemeService.getSchemeList(status);
- return success(BeanUtils.toBean(list, HrmSocialSecuritySchemeRespVO.class));
+ List<HrmSocialSecuritySchemeRespVO> respList = BeanUtils.toBean(list, HrmSocialSecuritySchemeRespVO.class);
+ // 濉厖閫傜敤閮ㄩ棬
+ fillDeptInfo(respList);
+ return success(respList);
+ }
+
+ /**
+ * 濉厖鏂规鐨勯�傜敤閮ㄩ棬ID涓庨儴闂ㄥ悕绉�
+ */
+ private void fillDeptInfo(List<HrmSocialSecuritySchemeRespVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ List<Long> schemeIds = list.stream().map(HrmSocialSecuritySchemeRespVO::getId).toList();
+ Map<Long, List<Long>> schemeDeptIdMap = schemeService.getSchemeDeptIdMap(schemeIds);
+ List<Long> allDeptIds = schemeDeptIdMap.values().stream().flatMap(List::stream).distinct().toList();
+ Map<Long, DeptRespDTO> deptMap = CollUtil.isEmpty(allDeptIds)
+ ? Collections.emptyMap() : deptApi.getDeptMap(allDeptIds);
+ for (HrmSocialSecuritySchemeRespVO respVO : list) {
+ List<Long> deptIds = schemeDeptIdMap.getOrDefault(respVO.getId(), Collections.emptyList());
+ respVO.setDeptIds(deptIds);
+ respVO.setDeptNames(deptIds.stream()
+ .map(deptId -> {
+ DeptRespDTO dept = deptMap.get(deptId);
+ return dept != null ? dept.getName() : "ID=" + deptId;
+ })
+ .collect(Collectors.joining("銆�")));
+ }
}
}
--
Gitblit v1.9.3