From 9a5d984a74d5f893fc51366b42391d9b4f8a83ed Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 15:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 ff8faa5..b7e64ed 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -1,13 +1,18 @@
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;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
+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.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
import lombok.AllArgsConstructor;
@@ -18,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.stream.Collectors;
import static com.ruoyi.common.enums.StaffLeaveReason.StaffLeaveReasonOther;
@@ -29,6 +35,12 @@
@Autowired
private StaffOnJobMapper staffOnJobMapper;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ @Autowired
+ private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
//鏂板绂昏亴鍒楄〃鍒嗛〉鏌ヨ
@Override
@@ -54,11 +66,21 @@
// 鏂板绂昏亴璁板綍
StaffLeave staffLeave = new StaffLeave();
staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId());
+ staffLeave.setReason(staffLeaveDto.getReason());
String reason = staffLeaveDto.getReason();
- if (!StaffLeaveReasonOther.getCode().equals(reason)){
- staffLeave.setRemark("");
+ if (StaffLeaveReasonOther.getCode().equals(reason)){
+ staffLeave.setRemark(staffLeaveDto.getRemark());
}
staffLeaveMapper.insert(staffLeave);
+
+ // 鏇存柊瀵瑰簲鐢ㄦ埛鐘舵�佷负鍋滅敤
+ // 鏍规嵁鍛樺伐缂栧彿鏌ヨ鐢ㄦ埛
+ SysUser sysUser = sysUserMapper.selectUserByUserName(staffOnJob.getStaffNo());
+ if (sysUser != null) {
+ sysUser.setStatus("1");
+ sysUser.setDelFlag("2");
+ sysUserMapper.updateUser(sysUser);
+ }
// 鏇存柊绂昏亴鐘舵�佷负绂昏亴
staffOnJob.setStaffState(0);
@@ -76,6 +98,7 @@
String reason = staffLeaveDto.getReason();
leave.setReason(reason);
+ leave.setLeaveDate(staffLeaveDto.getLeaveDate());
// 鏍￠獙绂昏亴鍘熷洜鏄惁涓哄叾浠栵紝濡傛灉鏄叾浠栵紝澶囨敞璧嬪��
if (StaffLeaveReasonOther.getCode().equals(reason)){
leave.setRemark(staffLeaveDto.getRemark());
@@ -89,6 +112,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