Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

2 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

Merge remote-tracking branch 'origin/dev_New' into dev_New

 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,8 +9,10 @@
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;
@@ -20,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;

@@ -34,6 +38,9 @@

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;

    //新增离职列表分页查询
    @Override
@@ -105,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);
    }

 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -55,6 +55,9 @@
    private StaffLeaveMapper staffLeaveMapper;

    @Autowired
    private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;

    @Autowired
    private SysUserServiceImpl sysUserService;

    @Autowired
@@ -215,6 +218,8 @@
        staffOnJobMapper.deleteBatchIds(ids);
        // 删除离职数据
        staffLeaveMapper.delete(Wrappers.<StaffLeave>lambdaQuery().in(StaffLeave::getStaffOnJobId, ids));
        // 删除打卡记录
        personalAttendanceRecordsMapper.delete(Wrappers.<PersonalAttendanceRecords>lambdaQuery().in(PersonalAttendanceRecords::getStaffOnJobId, ids));
        // 删除用户数据
        List<SysUser> sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
                .in(SysUser::getUserName, staffOnJobs.stream().map(StaffOnJob::getStaffNo).collect(Collectors.toList())));