From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmTaxRateConfigServiceImpl.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmTaxRateConfigServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmTaxRateConfigServiceImpl.java
index 9787e8d..30daf66 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmTaxRateConfigServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmTaxRateConfigServiceImpl.java
@@ -1,5 +1,12 @@
package cn.iocoder.yudao.module.hrm.service.salary;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+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.dal.dataobject.salary.HrmTaxRateConfigDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmTaxRateConfigMapper;
import jakarta.annotation.Resource;
@@ -8,15 +15,18 @@
import org.springframework.validation.annotation.Validated;
import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.TAX_RATE_CONFIG_NOT_EXISTS;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
+import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
/**
* 涓◣绋庣巼閰嶇疆 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -66,4 +76,61 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public HrmTaxRateConfigImportRespVO importTaxRateConfigList(
+ List<HrmTaxRateConfigImportExcelVO> importList, HrmTaxRateConfigImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importList = filterList(importList, item -> item.getLevel() != null);
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(TAX_RATE_CONFIG_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ HrmTaxRateConfigImportRespVO respVO = HrmTaxRateConfigImportRespVO.builder()
+ .createNames(new ArrayList<>())
+ .updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>())
+ .build();
+ importList.forEach(importConfig -> {
+ String configKey = StrUtil.isNotBlank(importConfig.getName()) ? importConfig.getName()
+ : (importConfig.getEffectiveDate() + "-" + importConfig.getLevel());
+ try {
+ // 2.1 鐢熸晥鏃ユ湡涓庣骇鏁板繀濉�
+ if (importConfig.getEffectiveDate() == null) {
+ respVO.getFailureNames().put(configKey, "鐢熸晥鏃ユ湡涓嶈兘涓虹┖");
+ return;
+ }
+ // 2.2 鍒ゆ柇鏄惁瀛樺湪锛堟寜鐢熸晥鏃ユ湡+绾ф暟鍞竴锛�
+ HrmTaxRateConfigDO existConfig = taxRateConfigMapper.selectByEffectiveDateAndLevel(
+ importConfig.getEffectiveDate(), importConfig.getLevel());
+ if (existConfig == null) {
+ // 2.2.1 鏂板
+ HrmTaxRateConfigDO config = BeanUtils.toBean(importConfig, HrmTaxRateConfigDO.class);
+ if (config.getStatus() == null) {
+ config.setStatus(0);
+ }
+ taxRateConfigMapper.insert(config);
+ respVO.getCreateNames().add(configKey);
+ return;
+ }
+ // 2.2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureNames().put(configKey,
+ StrUtil.format(TAX_RATE_CONFIG_EXISTS.getMsg(), configKey));
+ return;
+ }
+ HrmTaxRateConfigDO updateConfig = BeanUtils.toBean(importConfig, HrmTaxRateConfigDO.class)
+ .setId(existConfig.getId());
+ if (updateConfig.getStatus() == null) {
+ updateConfig.setStatus(0);
+ }
+ taxRateConfigMapper.updateById(updateConfig);
+ respVO.getUpdateNames().add(configKey);
+ } catch (ServiceException ex) {
+ respVO.getFailureNames().put(configKey, ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3