From 2a71f6790ddf6be7f63e6b009fc8d325a2a1d13b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 27 四月 2026 13:07:34 +0800
Subject: [PATCH] 添加相关接口附件信息
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 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..548323d 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);
@@ -105,6 +104,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