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/HrmTaxRateConfigController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
index 2df35be..c7e3dca 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.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.HrmTaxRateConfigImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmTaxRateConfigImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmTaxRateConfigImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmTaxRateConfigRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmTaxRateConfigSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmTaxRateConfigDO;
@@ -10,12 +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;
@@ -59,7 +67,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰彇涓◣绋庣巼閰嶇疆")
@Parameter(name = "id", description = "閰嶇疆ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:query')")
public CommonResult<HrmTaxRateConfigRespVO> getTaxRateConfig(@RequestParam("id") Long id) {
HrmTaxRateConfigDO config = taxRateConfigService.getTaxRateConfig(id);
return success(BeanUtils.toBean(config, HrmTaxRateConfigRespVO.class));
@@ -67,7 +74,6 @@
@GetMapping("/list")
@Operation(summary = "鑾峰彇涓◣绋庣巼閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:query')")
public CommonResult<List<HrmTaxRateConfigRespVO>> getTaxRateConfigList() {
List<HrmTaxRateConfigDO> list = taxRateConfigService.getTaxRateConfigList();
return success(BeanUtils.toBean(list, HrmTaxRateConfigRespVO.class));
@@ -76,11 +82,33 @@
@GetMapping("/get-effective")
@Operation(summary = "鑾峰彇鐢熸晥鐨勪釜绋庣◣鐜囬厤缃垪琛紙鎸夌骇鏁版帓搴忥級")
@Parameter(name = "effectiveDate", description = "鐢熸晥鏃ユ湡", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:query')")
public CommonResult<List<HrmTaxRateConfigRespVO>> getEffectiveTaxRateConfigList(
@RequestParam("effectiveDate") LocalDate effectiveDate) {
List<HrmTaxRateConfigDO> list = taxRateConfigService.getEffectiveTaxRateConfigList(effectiveDate);
return success(BeanUtils.toBean(list, HrmTaxRateConfigRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆涓◣绋庣巼閰嶇疆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<HrmTaxRateConfigImportExcelVO> list = Arrays.asList(
+ HrmTaxRateConfigImportExcelVO.builder().name("2026骞翠釜绋庣◣鐜囪〃").effectiveDate(LocalDate.of(2026, 1, 1))
+ .level(1).minAmount(new BigDecimal("0")).maxAmount(new BigDecimal("36000"))
+ .taxRate(new BigDecimal("3")).quickDeduction(new BigDecimal("0")).status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "涓◣绋庣巼閰嶇疆瀵煎叆妯℃澘.xls", "涓◣绋庣巼閰嶇疆鍒楄〃",
+ HrmTaxRateConfigImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆涓◣绋庣巼閰嶇疆")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:import')")
+ public CommonResult<HrmTaxRateConfigImportRespVO> importExcel(@Valid HrmTaxRateConfigImportReqVO importReqVO)
+ throws Exception {
+ List<HrmTaxRateConfigImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmTaxRateConfigImportExcelVO.class);
+ return success(taxRateConfigService.importTaxRateConfigList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3