fix(bug修复): 部门全称

luoyb

2021-03-12 7b7b63de881e04a8197bfa3d145f797167eb8e3c

fix(bug修复): 部门全称

1.各标签页面关联查询部门全称

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

@@ -2,7 +2,7 @@
<!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.EmpAccidentCasesMapper">
    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpAccidentCases">
        select a.* from t_emp_accidentcases a 
        select a.* ,b.allDeptName from t_emp_accidentcases 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}

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

@@ -2,7 +2,7 @@
<!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.EmpBadRecord">
        select a.* from t_emp_badrecord a
        select a.*,b.allDeptName 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}

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper">

    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpContractInfo">
        select a.* from t_emp_contractinfo a 
        select a.*,b.allDeptName from t_emp_contractinfo 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}

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper">

    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpDimissionAttend">
        select a.* from t_emp_dimissionattend a 
        select a.* ,b.allDeptName from t_emp_dimissionattend 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}

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

@@ -2,7 +2,7 @@
<!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.EmpInsuranceMapper">
    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpInsurance">
        select a.* from t_emp_insurance a 
        select a.*,b.allDeptName from t_emp_insurance 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}

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

@@ -2,7 +2,7 @@
<!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.EmpLaborTroubleMapper">
    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpLaborTrouble">
        select a.* from t_emp_labortrouble a 
        select a.*,b.allDeptName from t_emp_labortrouble 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}

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper">

    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpLeaveInfo">
        select a.* from t_emp_leaveinfo a 
        select a.*,b.allDeptName from t_emp_leaveinfo 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}

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

@@ -2,7 +2,7 @@
<!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.EmpOccupationalMapper">
    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpOccupational">
        select a.* from t_emp_occupational a 
        select a.*,b.allDeptName from t_emp_occupational 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}

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper">

    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpPhysicalExam">
        select a.* from t_emp_physicalexam a 
        select a.*,b.allDeptName from t_emp_physicalexam 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}

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

@@ -2,7 +2,7 @@
<!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.EmpRemarkInfoMapper">
    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpRemarkInfo">
        select a.* from t_emp_remarkinfo a 
        select a.*,b.allDeptName from t_emp_remarkinfo 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}

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpResignMapper">

    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpResign">
        select a.* from t_emp_resign a 
        select a.*,b.allDeptName from t_emp_resign 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}

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

@@ -2,7 +2,7 @@
<!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.EmpUnemploymentMapper">
    <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpUnemployment">
        select a.* from t_emp_unemployment a 
        select a.*,b.allDeptName from t_emp_unemployment 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}

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper">

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

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

@@ -94,10 +94,12 @@
        } 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));
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);

        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);

        List<EmpPhysicalExam> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);