yz
2021-03-07 b8d038947e66850f1a6ec1f93e1805ba33f6fdc0
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]);
@@ -212,7 +212,7 @@
        list.forEach(p -> {
            //请假类型
            p.setLeaveTypeName(dicItems.stream()
                    .filter(k -> DicCode.LEAVETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
                    .filter(k -> DicCode.LEAVE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("事假"));