fix(bug修复): 部门管理、员工信息查询与显示

luoyb

2021-03-10 f22196a273dae1cc4f67bf6e4806e0e33fae7997

fix(bug修复): 部门管理、员工信息查询与显示

1.部门增加了部门全称字段
2.人员增加了保存部门全称字段并根据部门全称查询部门，列表显示和导出的部门内容为部门全称

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java

@@ -14,4 +14,5 @@
    private Integer orderNum;
    private String deptType;
    private String deptFunction;
    private String allDeptName;
}

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java

@@ -67,6 +67,11 @@
    @TableField(exist = false)
    private String  deptFunctionName;

    @FieldInfo(name = "allDeptName", type = "varchar", explain = "部门全称")
    @TableField("allDeptName")
    private String  allDeptName = "";


    private transient String createTimeFrom;

    private transient String createTimeTo;

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

@@ -49,7 +49,7 @@
    @ExcelField(value = "档案号")
    private String archivesNumb = "";

    //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

@@ -425,4 +425,8 @@

    @TableField(exist = false)
    private String inOutType;

    @FieldInfo(name = "allDeptName", type = "varchar", explain = "部门全称")
    @TableField("allDeptName")
    private String  allDeptName = "";
}

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

@@ -97,7 +97,8 @@
        Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpBaseInfo> iPage = empBaseInfoMapper.selectPageVo(page, createQueryWrapper(empBaseInfo));
        //设置部门
        List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
        // List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
        List<EmpBaseInfo> list = iPage.getRecords();
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            p.setSexName("1".equals(p.getSex()) ? "男" : "女");
@@ -254,6 +255,11 @@
                    .filter(k -> k.getDeptId().equals(empBaseInfo.getDeptId()))
                    .findFirst()
                    .map(Dept::getDeptName)
                    .orElse(""));
            empBaseInfo.setAllDeptName(depts.stream()
                    .filter(k -> k.getDeptId().equals(empBaseInfo.getDeptId()))
                    .findFirst()
                    .map(Dept::getAllDeptName)
                    .orElse(""));
        }
        return empBaseInfoList;
@@ -903,8 +909,8 @@
        if (StringUtils.isNotBlank(empBaseInfo.getBaseKey())) {
            queryWrapper.and(p -> {
                p.like("a.EmpNumb", empBaseInfo.getBaseKey());
                p.or().like("a.EmpName", empBaseInfo.getBaseKey());
                p.or().like("a.DeptName", empBaseInfo.getBaseKey());
                p.or().like("a.allDeptName", empBaseInfo.getBaseKey());
                p.or().like("a.empName", empBaseInfo.getBaseKey());
                p.or().like("a.CertificateNumb", empBaseInfo.getBaseKey());
                p.or().like("a.archivesNumb", empBaseInfo.getBaseKey());
                p.or().like("a.stature", empBaseInfo.getBaseKey());
@@ -928,7 +934,7 @@
            queryWrapper.like("a.EmpName", empBaseInfo.getEmpName());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empBaseInfo.getDeptName());
            queryWrapper.like("a.allDeptName", empBaseInfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
            queryWrapper.like("a.CertificateNumb", empBaseInfo.getCertificateNumb());

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java

@@ -132,6 +132,7 @@
            tree.setOrderNum(dept.getOrderNum());
            tree.setDeptFunction(dept.getDeptFunction());
            tree.setDeptType(dept.getDeptType());
            tree.setAllDeptName(dept.getAllDeptName());
            trees.add(tree);
        });
    }