fix(bug修复): 员工智搜增加员工类型搜索项

luoyb

2021-03-07 cc5d37f9636138adb1dc490764fdd41a701591f5

fix(bug修复): 员工智搜增加员工类型搜索项

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

@@ -137,4 +137,8 @@
    @TableField(exist = false)
    private String badDateStr= "";

    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
    private String empStatus = "";
}

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

@@ -145,5 +145,7 @@
    @ExcelField(value = "新岗位")
    private String newJobName= "";

    @TableField(exist = false)
    private String empStatus;

}

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

@@ -154,4 +154,7 @@
    @ExcelField(value = "身份证号码")
    @TableField(exist = false)
    private String certificateNumb="";

    @TableField(exist = false)
    private String empStatus;
}

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

@@ -128,4 +128,6 @@
    @TableField(exist = false)
    private String remarkDateStr= "";

    @TableField(exist = false)
    private String empStatus;
}

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

@@ -136,4 +136,8 @@

    @TableField(exist = false)
    private String applayDateStr;

    @TableField(exist = false)
    private String empStatus;

}

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

@@ -143,4 +143,6 @@
    @TableField(exist = false)
    private String applayDateStr;

    @TableField(exist = false)
    private String empStatus;
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java

@@ -1,7 +1,12 @@
package cc.mrbird.febs.server.hr.mapper;

import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

@@ -60,4 +65,6 @@
            "        </foreach>\n" +
            "</script>")
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpBadRecord> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.xml

@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper">

    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpRemarkInfo">
        select a.* from t_emp_badrecord a
        inner join t_emp_baseinfo b on a.empId = b.empId
        inner join t_dept c on b.deptId = c.DEPT_ID
        ${ew.customSqlSegment}
    </select>
</mapper>

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

@@ -92,7 +92,7 @@
            queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empAccidentcases.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());

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

@@ -1,17 +1,20 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -47,35 +50,41 @@
    private final RedisService redisService;
    private final EmpBadRecordMapper empBadrecordMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

    @Override
    public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
        if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
            queryWrapper.like(EmpBadRecord::getEmpNumb, empBadrecord.getEmpNumb());
        QueryWrapper<EmpBadRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.delFlag", empBadrecord.getDelFlag());
         if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empBadrecord.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empBadrecord.getEmpName())) {
            queryWrapper.like(EmpBadRecord::getEmpName, empBadrecord.getEmpName());
            queryWrapper.like("a.EmpName", empBadrecord.getEmpName());
        }
        if (StringUtils.isNotBlank(empBadrecord.getCertificateNumb())) {
            queryWrapper.like(EmpBadRecord::getCertificateNumb, empBadrecord.getCertificateNumb());
            queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
            queryWrapper.like(EmpBadRecord::getDeptName, empBadrecord.getDeptName());
            queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
        }
        if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
            queryWrapper.between(EmpBadRecord::getBadDate, empBadrecord.getBadDateStr().split(",")[0],
                    empBadrecord.getBadDateStr().split(",")[1]);
            queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
            queryWrapper.like(EmpBadRecord::getBadContent, empBadrecord.getBadContent());
            queryWrapper.like("a.badContent", empBadrecord.getBadContent());
        }
        if (StringUtils.isNotBlank(empBadrecord.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empBadrecord.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        return empBadrecordMapper.selectPageVo(page, queryWrapper);
    }

    @Override

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

@@ -81,11 +81,14 @@
            queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like("a.EmpStatus", empContractinfo.getEmpStatus());
            queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
        }
        if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);

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

@@ -79,7 +79,7 @@
            queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empDimissionattend.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empDimissionattend.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());

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

@@ -58,6 +58,11 @@
        if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
            queryWrapper.eq("a.dimissionType", empDimissionlog.getDimissionType());
        }
        if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return this.baseMapper.selectPageVo(page,queryWrapper);

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

@@ -81,7 +81,7 @@
            queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
        }
        if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empInsurance.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());

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

@@ -65,6 +65,11 @@
        if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
            queryWrapper.eq("a.changeType", empJobchange.getChangeType());
        }
        if (StringUtils.isNotBlank(empJobchange.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return this.baseMapper.selectPageVo(page, queryWrapper);

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

@@ -88,7 +88,7 @@
            queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empLabortrouble.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
            queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());

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

@@ -77,7 +77,7 @@
            queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empLeaveinfo.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
            queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);

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

@@ -94,7 +94,7 @@
            queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
        }
        if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empOccupational.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());

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

@@ -88,7 +88,9 @@
            queryWrapper.like("a.Conclusion", empPhysicalexam.getConclusion());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empPhysicalexam.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

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

@@ -76,6 +76,11 @@
        if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
            queryWrapper.like("a.RemarkContent", empRemarkinfo.getRemarkContent());
        }
        if (StringUtils.isNotBlank(empRemarkinfo.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empRemarkinfo.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return empRemarkinfoMapper.selectPageVo(page, queryWrapper);

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

@@ -79,6 +79,11 @@
        if (StringUtils.isNotBlank(empResign.getReason())) {
            queryWrapper.like("a.Reason", empResign.getReason());
        }
        if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return empResignMapper.selectPageVo(page, queryWrapper);
    }

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

@@ -81,6 +81,11 @@
        if (StringUtils.isNotBlank(empUnemployment.getApplayReason())) {
            queryWrapper.like("a.ApplayReason", empUnemployment.getApplayReason());
        }
        if (StringUtils.isNotBlank(empUnemployment.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empUnemployment.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
        return empUnemploymentMapper.selectPageVo(page, queryWrapper);

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

@@ -69,9 +69,15 @@
        if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
            queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
    }