产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
5 天以前 1c518e10a50050d383e714b581c94dea58ec4d67 
 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java


@@ -6,8 +6,8 @@


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.OrderUtils;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.common.utils.StringUtils;


import com.ruoyi.common.utils.poi.ExcelUtil;


import com.ruoyi.dto.WordDateDto;


import com.ruoyi.project.system.domain.SysDept;


@@ -26,18 +26,18 @@


import com.ruoyi.staff.service.IStaffOnJobService;


import freemarker.template.Configuration;


import freemarker.template.Template;


import lombok.AllArgsConstructor;




import jakarta.servlet.http.HttpServletResponse;


import lombok.RequiredArgsConstructor;


import org.apache.commons.collections4.CollectionUtils;


import org.apache.commons.collections4.ListUtils;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.http.HttpServletResponse;


import java.io.*;


import java.io.File;


import java.io.FileOutputStream;


import java.io.OutputStreamWriter;


import java.io.StringWriter;


import java.nio.charset.StandardCharsets;


import java.time.Instant;


import java.time.LocalDate;


@@ -45,59 +45,32 @@


import java.util.*;


import java.util.stream.Collectors;




@AllArgsConstructor


@RequiredArgsConstructor


@Service


public class StaffOnJobServiceImpl extends ServiceImpl<StaffOnJobMapper, StaffOnJob>  implements IStaffOnJobService {




    @Autowired


    private StaffOnJobMapper staffOnJobMapper;




    @Autowired


    private SysDeptMapper sysDeptMapper;




    @Autowired


    private SysRoleMapper sysRoleMapper;




    @Autowired


    private SysPostMapper sysPostMapper;




    @Autowired


    private StaffContractMapper staffContractMapper;


    @Autowired


    private StaffLeaveMapper staffLeaveMapper;




    @Autowired


    private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;




    @Autowired


    private SysUserServiceImpl sysUserService;




    @Autowired


    private SysUserMapper sysUserMapper;




    @Autowired


    private StaffEducationServiceImpl staffEducationService;




    @Autowired


    private StaffEducationMapper staffEducationMapper;




    @Autowired


    private StaffWorkExperienceMapper staffWorkExperienceMapper;




    @Autowired


    private StaffWorkExperienceServiceImpl staffWorkExperienceServiceImpl;




    @Autowired


    private StaffEmergencyContactMapper staffEmergencyContactMapper;




    @Autowired


    private StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;


    private final StaffOnJobMapper staffOnJobMapper;


    private final SysDeptMapper sysDeptMapper;


    private final SysRoleMapper sysRoleMapper;


    private final SysPostMapper sysPostMapper;


    private final StaffContractMapper staffContractMapper;


    private final StaffLeaveMapper staffLeaveMapper;


    private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;


    private final SysUserServiceImpl sysUserService;


    private final SysUserMapper sysUserMapper;


    private final StaffEducationServiceImpl staffEducationService;


    private final StaffEducationMapper staffEducationMapper;


    private final StaffWorkExperienceMapper staffWorkExperienceMapper;


    private final StaffWorkExperienceServiceImpl staffWorkExperienceServiceImpl;


    private final StaffEmergencyContactMapper staffEmergencyContactMapper;


    private final StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;






    //在职员工台账分页查询


    @Override


    public IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {


        return staffOnJobMapper.staffOnJobListPage(page,staffOnJob);


    public IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJobDto staffOnJob) {


        IPage<StaffOnJobDto> staffOnJobDtoIPage = staffOnJobMapper.staffOnJobListPage(page, staffOnJob);


        return staffOnJobDtoIPage;


    }




    //新增入职


@@ -112,6 +85,7 @@


        }




        // 创建入职数据


        syncStudyInfoFromEducation(staffOnJobPrams);


        staffOnJobPrams.setContractExpireTime(staffOnJobPrams.getContractEndTime());


        staffOnJobPrams.setStaffState(1);


        staffOnJobMapper.insert(staffOnJobPrams);


@@ -170,6 +144,7 @@


        // 绑定子表数据


        bingingStaffOnJobExtra(id,staffOnJobParams);


        // 更新员工数据


        syncStudyInfoFromEducation(staffOnJobParams);


        staffOnJobParams.setContractExpireTime(staffOnJobParams.getContractEndTime());


        return staffOnJobMapper.updateById(staffOnJobParams);


    }


@@ -187,6 +162,7 @@


                    .forEach(staff -> staff.setStaffOnJobId(id)); // 赋值


            staffEducationService.saveBatch(staffOnJobPrams.getStaffEducationList());


        }




        // 新增工作经历


        if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())){


            staffOnJobPrams.getStaffWorkExperienceList().stream()


@@ -203,6 +179,28 @@


        }


    }




    private void syncStudyInfoFromEducation(StaffOnJob staffOnJobPrams) {


        if (staffOnJobPrams == null || CollectionUtils.isEmpty(staffOnJobPrams.getStaffEducationList())) {


            if (staffOnJobPrams != null) {


                staffOnJobPrams.setFirstStudy("/");


                staffOnJobPrams.setProfession("/");


            }


            return;


        }


        Optional<StaffEducation> matchedEducation = staffOnJobPrams.getStaffEducationList().stream()


                .filter(Objects::nonNull)


                .filter(education -> StringUtils.isNotEmpty(education.getMajor()))


                .findFirst();


        if (matchedEducation.isPresent()) {


            StaffEducation education = matchedEducation.get();


            staffOnJobPrams.setFirstStudy(education.getEducation());


            staffOnJobPrams.setProfession(education.getMajor());


            return;


        }


        staffOnJobPrams.setFirstStudy("/");


        staffOnJobPrams.setProfession("/");


    }






    /**


     * 通过员工id删除教育经历，工作经历，紧急联系人