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/HrmLeaveTypeConfigServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmLeaveTypeConfigServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmLeaveTypeConfigServiceImpl.java
index d806d44..66a5a4c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmLeaveTypeConfigServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmLeaveTypeConfigServiceImpl.java
@@ -1,24 +1,47 @@
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.HrmLeaveTypeConfigImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmLeaveTypeConfigImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmLeaveTypeConfigImportRespVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmLeaveTypeConfigDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmLeaveTypeConfigMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.LEAVE_TYPE_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
public class HrmLeaveTypeConfigServiceImpl implements HrmLeaveTypeConfigService {
+
+ /**
+ * 璇峰亣绫诲瀷 -> 榛樿鍚嶇О
+ */
+ private static final Map<Integer, String> LEAVE_TYPE_NAME_MAP = Map.of(
+ 1, "浜嬪亣",
+ 2, "鐥呭亣",
+ 3, "骞村亣",
+ 4, "濠氬亣",
+ 5, "浜у亣",
+ 6, "涓у亣"
+ );
@Resource
private HrmLeaveTypeConfigMapper leaveTypeConfigMapper;
@@ -45,4 +68,60 @@
}
}
+ @Override
+ public HrmLeaveTypeConfigImportRespVO importLeaveTypeConfigList(
+ List<HrmLeaveTypeConfigImportExcelVO> importList, HrmLeaveTypeConfigImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importList = filterList(importList, item -> item.getLeaveType() != null);
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(LEAVE_TYPE_CONFIG_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ HrmLeaveTypeConfigImportRespVO respVO = HrmLeaveTypeConfigImportRespVO.builder()
+ .createNames(new ArrayList<>())
+ .updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>())
+ .build();
+ importList.forEach(importConfig -> {
+ try {
+ // 2.1 鍚嶇О鍏滃簳锛堜粠璇峰亣绫诲瀷鎺ㄥ锛�
+ String configName = StrUtil.isNotBlank(importConfig.getName())
+ ? importConfig.getName() : LEAVE_TYPE_NAME_MAP.get(importConfig.getLeaveType());
+ if (StrUtil.isBlank(configName)) {
+ respVO.getFailureNames().put(String.valueOf(importConfig.getLeaveType()), "璇峰亣绫诲瀷涓嶅悎娉�");
+ return;
+ }
+ // 2.2 鍒ゆ柇鏄惁瀛樺湪锛堟寜璇峰亣绫诲瀷鍞竴锛�
+ HrmLeaveTypeConfigDO existConfig = leaveTypeConfigMapper.selectByLeaveType(importConfig.getLeaveType());
+ if (existConfig == null) {
+ // 2.2.1 鏂板
+ HrmLeaveTypeConfigDO config = BeanUtils.toBean(importConfig, HrmLeaveTypeConfigDO.class)
+ .setName(configName);
+ if (config.getStatus() == null) {
+ config.setStatus(0);
+ }
+ leaveTypeConfigMapper.insert(config);
+ respVO.getCreateNames().add(configName);
+ return;
+ }
+ // 2.2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureNames().put(configName,
+ StrUtil.format(LEAVE_TYPE_CONFIG_EXISTS.getMsg(), configName));
+ return;
+ }
+ HrmLeaveTypeConfigDO updateConfig = BeanUtils.toBean(importConfig, HrmLeaveTypeConfigDO.class)
+ .setId(existConfig.getId()).setName(configName);
+ if (updateConfig.getStatus() == null) {
+ updateConfig.setStatus(0);
+ }
+ leaveTypeConfigMapper.updateById(updateConfig);
+ respVO.getUpdateNames().add(configName);
+ } catch (ServiceException ex) {
+ respVO.getFailureNames().put(String.valueOf(importConfig.getLeaveType()), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3