From 5421b8af862890dcf187c2ad5ece55423959ba85 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 19:27:14 +0800
Subject: [PATCH] feat(bpm): 全部业务审批流改回 BPM,审批统一进入协同办公
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
index 6e96e27..9f4869f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
@@ -1,7 +1,13 @@
package cn.iocoder.yudao.module.hrm.service.attendance;
+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.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidaySaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceHolidayDO;
@@ -13,15 +19,18 @@
import java.time.DayOfWeek;
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.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
/**
* 鑰冨嫟鑺傚亣鏃ラ厤缃� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
*/
@Service
@Validated
@@ -100,4 +109,57 @@
return dayOfWeek != DayOfWeek.SATURDAY && dayOfWeek != DayOfWeek.SUNDAY;
}
+ @Override
+ public HrmAttendanceHolidayImportRespVO importAttendanceHolidayList(
+ List<HrmAttendanceHolidayImportExcelVO> importList, HrmAttendanceHolidayImportReqVO importReqVO) {
+ // 1. 鏍¢獙闈炵┖
+ importList = filterList(importList, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(ATTENDANCE_HOLIDAY_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ HrmAttendanceHolidayImportRespVO respVO = HrmAttendanceHolidayImportRespVO.builder()
+ .createNames(new ArrayList<>())
+ .updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>())
+ .build();
+ importList.forEach(importHoliday -> {
+ try {
+ // 2.1 鏃ユ湡蹇呭~
+ if (importHoliday.getDate() == null) {
+ respVO.getFailureNames().put(importHoliday.getName(), "鏃ユ湡涓嶈兘涓虹┖");
+ return;
+ }
+ // 2.2 鍒ゆ柇鏄惁瀛樺湪锛堟寜鏃ユ湡鍞竴锛�
+ HrmAttendanceHolidayDO existHoliday = attendanceHolidayMapper.selectByDate(importHoliday.getDate());
+ if (existHoliday == null) {
+ // 2.2.1 鏂板
+ HrmAttendanceHolidayDO holiday = BeanUtils.toBean(importHoliday, HrmAttendanceHolidayDO.class);
+ if (holiday.getIsLegal() == null) {
+ holiday.setIsLegal(0);
+ }
+ attendanceHolidayMapper.insert(holiday);
+ respVO.getCreateNames().add(importHoliday.getName());
+ return;
+ }
+ // 2.2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureNames().put(importHoliday.getName(),
+ StrUtil.format(ATTENDANCE_HOLIDAY_EXISTS.getMsg(), importHoliday.getName()));
+ return;
+ }
+ HrmAttendanceHolidayDO updateHoliday = BeanUtils.toBean(importHoliday, HrmAttendanceHolidayDO.class)
+ .setId(existHoliday.getId());
+ if (updateHoliday.getIsLegal() == null) {
+ updateHoliday.setIsLegal(0);
+ }
+ attendanceHolidayMapper.updateById(updateHoliday);
+ respVO.getUpdateNames().add(importHoliday.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureNames().put(importHoliday.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3