From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
index a94ac0f..4978d0f 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.staff.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,34 +9,32 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.StaffLeaveDto;
+import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
+import com.ruoyi.staff.pojo.StaffLeave;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import com.ruoyi.staff.pojo.StaffLeave;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.stream.Collectors;
import static com.ruoyi.common.enums.StaffLeaveReason.StaffLeaveReasonOther;
-@AllArgsConstructor
+@RequiredArgsConstructor
@Service
public class StaffLeaveServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements StaffLeaveService {
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
+ private final SysUserMapper sysUserMapper;
+ private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
-
- //鏂板绂昏亴鍒楄〃鍒嗛〉鏌ヨ
@Override
public IPage<StaffLeaveDto> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
return staffLeaveMapper.staffLeaveListPage(page,staffLeaveDto);
@@ -60,6 +59,7 @@
StaffLeave staffLeave = new StaffLeave();
staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId());
staffLeave.setReason(staffLeaveDto.getReason());
+ staffLeave.setLeaveDate(staffLeaveDto.getLeaveDate());
String reason = staffLeaveDto.getReason();
if (StaffLeaveReasonOther.getCode().equals(reason)){
staffLeave.setRemark(staffLeaveDto.getRemark());
@@ -105,6 +105,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int del(List<Integer> ids) {
+ List<StaffLeave> staffLeaves = staffLeaveMapper.selectBatchIds(ids);
+ // 鏌ヨ绂昏亴璁板綍锛岃幏鍙栧搴旂殑staffOnJobId
+ List<Long> staffOnJobIds = staffLeaves.stream()
+ .map(StaffLeave::getStaffOnJobId)
+ .collect(Collectors.toList());
+
+ // 鍒犻櫎鎵撳崱璁板綍
+ if (!staffOnJobIds.isEmpty()) {
+ personalAttendanceRecordsMapper.delete(new LambdaQueryWrapper<PersonalAttendanceRecords>()
+ .in(PersonalAttendanceRecords::getStaffOnJobId, staffOnJobIds));
+ }
+
+ // 鍒犻櫎鍛樺伐鍙拌处
+ staffOnJobMapper.deleteBatchIds(staffOnJobIds);
+
// 鍒犻櫎绂昏亴鏁版嵁
return staffLeaveMapper.deleteBatchIds(ids);
}
--
Gitblit v1.9.3