完善员工智搜

yijiusmile

2021-02-17 cea0deacb7c614918d213fe3a18c9fa1abf09dc8

完善员工智搜

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java

@@ -244,6 +244,17 @@
    @FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
    @TableField(exist = false)
    private String certificateListName = "";
    
    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    private String empStatus = "";
    
    @FieldInfo(name = "dimissionDate", type = "datetime", explain = "离职日期")
    @TableField("dimissionDate")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dimissionDate;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
@@ -275,5 +286,14 @@
    @TableField("version")
    @Version
    private Integer version = 0;
    
    @TableField(exist = false)
    private String ageStr = "";
	
    @TableField(exist = false)
    private String entryDateStr= "";
	
    @TableField(exist = false)
    private String dimissionDateStr= "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java

@@ -46,6 +46,10 @@
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";
    
    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    private String empStatus = "";

    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
@@ -138,5 +142,11 @@
    @TableField("version")
    @Version
    private Integer version = 0;
    
    @TableField(exist = false)
    private String signingDateStr= "";
    
    @TableField(exist = false)
    private String endDateStr= "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java

@@ -49,6 +49,10 @@
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";
    
    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    private String empStatus = "";

    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
@@ -73,6 +77,10 @@
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";
    
    @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤年份")
    @TableField("attendMonth")
    private String attendYear = "";

    @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
    @TableField("attendMonth")
@@ -136,5 +144,8 @@
    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";
    
    @TableField(exist = false)
    private String deductStr;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java

@@ -49,6 +49,10 @@
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";
    
    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    private String empStatus = "";

    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
@@ -141,5 +145,8 @@
    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";
    
    @TableField(exist = false)
    private String leaveDateStr= "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java

@@ -45,6 +45,10 @@
            @FieldInfo(name = "empName",type = "varchar",explain = "员工姓名")
            @TableField("empName")
            private String empName="";
            
            @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
            @TableField("empStatus")
            private String empStatus = "";

            @FieldInfo(name = "certificateNumb",type = "varchar",explain = "证件号码")
            @TableField("certificateNumb")
@@ -139,5 +143,8 @@
            @TableField("version")
            @Version
            private Integer version=0;
            
            @TableField(exist = false)
            private String physicalExamDateStr= "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java

@@ -45,6 +45,10 @@
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName;
    
    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    private String empStatus = "";

    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java

@@ -1,5 +1,22 @@
package cc.mrbird.febs.server.hr.service.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -13,18 +30,7 @@
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;

/**
 * name:EmpBaseinfo
@@ -50,9 +56,45 @@
    public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
        LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
        if (StringUtils.isNotBlank(empBaseInfo.getEmpNumb())) {
            queryWrapper.eq(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
            queryWrapper.eq(EmpBaseInfo::getEmpName, empBaseInfo.getEmpName());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
            queryWrapper.eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
            queryWrapper.eq(EmpBaseInfo::getDeptName, empBaseInfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
            queryWrapper.between(EmpBaseInfo::getEntryDate, empBaseInfo.getEntryDateStr().split(",")[0],  empBaseInfo.getEntryDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getDimissionDateStr())) {
            queryWrapper.between(EmpBaseInfo::getDimissionDate, empBaseInfo.getDimissionDateStr().split(",")[0],  empBaseInfo.getDimissionDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
            queryWrapper.eq(EmpBaseInfo::getSex, empBaseInfo.getSex());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
            queryWrapper.eq(EmpBaseInfo::getEducation, empBaseInfo.getEducation());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
            queryWrapper.eq(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
            queryWrapper.between(EmpBaseInfo::getAge, empBaseInfo.getAgeStr().split(",")[0],  empBaseInfo.getAgeStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
            queryWrapper.eq(EmpBaseInfo::getArchivesStatus, empBaseInfo.getArchivesStatus());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
            queryWrapper.eq(EmpBaseInfo::getInsuranceType, empBaseInfo.getInsuranceType());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
            queryWrapper.eq(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus());
        }
        Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
        //设置部门

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java

@@ -1,22 +1,30 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;

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 cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.*;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import lombok.RequiredArgsConstructor;

/**
 * name:EmpContractinfo
@@ -41,6 +49,30 @@
    public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
        LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
        if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
            queryWrapper.eq(EmpContractInfo::getEmpNumb, empContractinfo.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getEmpName())) {
            queryWrapper.eq(EmpContractInfo::getEmpName, empContractinfo.getEmpName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getCertificateNumb())) {
            queryWrapper.eq(EmpContractInfo::getCertificateNumb, empContractinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.eq(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
            queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0],  empContractinfo.getSigningDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
            queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0],  empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.eq(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
        }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
        }
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java

@@ -1,9 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -41,6 +45,30 @@
    public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
        LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
        if (StringUtils.isNotBlank(empDimissionattend.getEmpNumb())) {
            queryWrapper.eq(EmpDimissionAttend::getEmpNumb, empDimissionattend.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getEmpName())) {
            queryWrapper.eq(EmpDimissionAttend::getEmpName, empDimissionattend.getEmpName());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getCertificateNumb())) {
            queryWrapper.eq(EmpDimissionAttend::getCertificateNumb, empDimissionattend.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
            queryWrapper.eq(EmpDimissionAttend::getDeptName, empDimissionattend.getDeptName());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
            queryWrapper.eq(EmpDimissionAttend::getAttendYear, empDimissionattend.getAttendYear());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getAttendMonth())) {
            queryWrapper.eq(EmpDimissionAttend::getAttendMonth, empDimissionattend.getAttendMonth());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getDeductStr())) {
            queryWrapper.eq(EmpDimissionAttend::getDeduct, empDimissionattend.getDeductStr());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
            queryWrapper.eq(EmpDimissionAttend::getEmpStatus, empDimissionattend.getEmpStatus());
        }
        Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java

@@ -1,22 +1,29 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;

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 cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.*;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import lombok.RequiredArgsConstructor;

/**
 * name:EmpLeaveinfo
@@ -41,6 +48,25 @@
    public IPage<EmpLeaveInfo> findEmpLeaveInfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
        LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpNumb())) {
            queryWrapper.eq(EmpLeaveInfo::getEmpNumb, empLeaveinfo.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpName())) {
            queryWrapper.eq(EmpLeaveInfo::getEmpName, empLeaveinfo.getEmpName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getCertificateNumb())) {
            queryWrapper.eq(EmpLeaveInfo::getCertificateNumb, empLeaveinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
            queryWrapper.eq(EmpLeaveInfo::getDeptName, empLeaveinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
            queryWrapper.eq(EmpLeaveInfo::getEmpStatus, empLeaveinfo.getEmpStatus());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
            queryWrapper.ge(EmpLeaveInfo::getBeginTime, empLeaveinfo.getLeaveDateStr().split(",")[0]);
            queryWrapper.le(EmpLeaveInfo::getEndTime, empLeaveinfo.getLeaveDateStr().split(",")[1]);
        }
        Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java

@@ -1,22 +1,29 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;

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 cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.*;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
import lombok.RequiredArgsConstructor;

/**
 * name:EmpPhysicalexam
@@ -41,6 +48,27 @@
    public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
        LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
            queryWrapper.eq(EmpPhysicalExam::getEmpNumb, empPhysicalexam.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpName())) {
            queryWrapper.eq(EmpPhysicalExam::getEmpName, empPhysicalexam.getEmpName());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getCertificateNumb())) {
            queryWrapper.eq(EmpPhysicalExam::getCertificateNumb, empPhysicalexam.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
            queryWrapper.eq(EmpPhysicalExam::getDeptName, empPhysicalexam.getDeptName());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
            queryWrapper.between(EmpPhysicalExam::getPhysicalExamDate, empPhysicalexam.getPhysicalExamDateStr().split(",")[0],  empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamType())) {
            queryWrapper.eq(EmpPhysicalExam::getPhysicalExamType, empPhysicalexam.getPhysicalExamType());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
            queryWrapper.eq(EmpPhysicalExam::getEmpStatus, empPhysicalexam.getEmpStatus());
        }
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java

@@ -3,9 +3,12 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -41,6 +44,18 @@
    public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
        if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
            queryWrapper.eq(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
            queryWrapper.eq(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
            queryWrapper.eq(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
            queryWrapper.eq(EmpWorkExperience::getEmpStatus, empWorkexperience.getEmpStatus());
        }
        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }