fix(bug修复): 员工附件增加相关证件查询

luoyb

2021-04-27 42f3ffb553c071f15d9fd4495c7bf8af795bf292

fix(bug修复): 员工附件增加相关证件查询

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

@@ -40,6 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.function.Consumer;

/**
 * 附件管理 Service实现
@@ -148,6 +149,18 @@
        }
        if (StringUtils.isNotBlank(vo.getEntryType())) {
            queryWrapper.in("a.entryType", vo.getEntryType().split(","));
        }        if (StringUtils.isNotBlank(vo.getCertificateList())) {
            String[] certificates = vo.getCertificateList().split(",");
            Consumer<QueryWrapper<EmpAccessoryVO>> consumer = new Consumer<QueryWrapper<EmpAccessoryVO>>() {
                @Override
                public void accept(QueryWrapper<EmpAccessoryVO> wrapper) {
                    for (int i = 0; i < certificates.length; i++) {
                        String ageBtn = certificates[i];
                        wrapper.or().like("a.certificateList", ageBtn);
                    }
                }
            };
            queryWrapper.and(consumer);
        }
        queryWrapper.inSql("c.dept_Id", remoteDeptService.userRightDepts());
        if (StrUtil.isNotBlank(vo.getFileName())){
@@ -184,7 +197,6 @@
                queryWrapper.orderByAsc("a.certificateNumb");
            }
        }

        queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName");
        Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
       // String querySql = empAccessoryMapper.getQuerySql();

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java

@@ -24,4 +24,5 @@
    private String fileName;
    private String field;
    private String order;
    private String certificateList;
}

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java

@@ -100,7 +100,7 @@
    }

    @GetMapping("setPositionRedis")
    List<Position> setPositionRedis(){
    List<Position> setPositionRedis() {
        return positionService.setPositionRedis();
    }
}