From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题(不含物料颜色字段)
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSocialSecuritySchemeController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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..e9e8dd2 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
@@ -2,6 +2,10 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSocialSecuritySchemeImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSocialSecuritySchemeImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSocialSecuritySchemeImportRespVO;
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;
@@ -10,11 +14,16 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -57,7 +66,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰彇绀句繚鍏Н閲戞柟妗�")
@Parameter(name = "id", description = "鏂规ID", required = true)
- @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));
@@ -66,11 +74,37 @@
@GetMapping("/list")
@Operation(summary = "鑾峰彇绀句繚鍏Н閲戞柟妗堝垪琛�")
@Parameter(name = "status", description = "鐘舵��")
- @PreAuthorize("@ss.hasPermission('hrm:social-security:query')")
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));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆绀句繚鍏Н閲戞柟妗堟ā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<HrmSocialSecuritySchemeImportExcelVO> list = Arrays.asList(
+ HrmSocialSecuritySchemeImportExcelVO.builder().name("鏍囧噯绀句繚鏂规").effectiveDate(LocalDate.of(2026, 1, 1))
+ .pensionCompanyRatio(new BigDecimal("16")).pensionPersonalRatio(new BigDecimal("8"))
+ .medicalCompanyRatio(new BigDecimal("9")).medicalPersonalRatio(new BigDecimal("2"))
+ .unemploymentCompanyRatio(new BigDecimal("0.5")).unemploymentPersonalRatio(new BigDecimal("0.5"))
+ .workInjuryRatio(new BigDecimal("0.4")).maternityRatio(new BigDecimal("0.8"))
+ .housingFundCompanyRatio(new BigDecimal("12")).housingFundPersonalRatio(new BigDecimal("12"))
+ .status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "绀句繚鍏Н閲戞柟妗堝鍏ユā鏉�.xls", "绀句繚鍏Н閲戞柟妗堝垪琛�",
+ HrmSocialSecuritySchemeImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆绀句繚鍏Н閲戞柟妗�")
+ @PreAuthorize("@ss.hasPermission('hrm:social-security-scheme:import')")
+ public CommonResult<HrmSocialSecuritySchemeImportRespVO> importExcel(
+ @Valid HrmSocialSecuritySchemeImportReqVO importReqVO) throws Exception {
+ List<HrmSocialSecuritySchemeImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmSocialSecuritySchemeImportExcelVO.class);
+ return success(schemeService.importSchemeList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3