yz
2021-03-15 8c318c3890c4a3f418eb7636e45d49737ea05643
修改bug
3个文件已修改
37 ■■■■■ 已修改文件
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -153,7 +153,38 @@
        if (StrUtil.isNotBlank(vo.getFileName())){
            queryWrapper.like("acc.filesName", vo.getFileName());
        }
        queryWrapper.orderByAsc("a.deptName,a.empName");
        if (StrUtil.equals(vo.getField(),"empName")){
            if (StrUtil.equals(vo.getOrder(),"descending")){
                queryWrapper.orderByDesc("a.empName");
            }else{
                queryWrapper.orderByAsc("a.empName");
            }
        }else if(StrUtil.equals(vo.getField(),"empNumb")){
            if (StrUtil.equals(vo.getOrder(),"descending")){
                queryWrapper.orderByDesc("a.empNumb");
            }else{
                queryWrapper.orderByAsc("a.empNumb");
            }
        }else if(StrUtil.equals(vo.getField(),"deptName")){
            if (StrUtil.equals(vo.getOrder(),"descending")){
                queryWrapper.orderByDesc("deptName");
            }else{
                queryWrapper.orderByAsc("deptName");
            }
        }else if(StrUtil.equals(vo.getField(),"jobName")){
            if (StrUtil.equals(vo.getOrder(),"descending")){
                queryWrapper.orderByDesc("a.jobName");
            }else{
                queryWrapper.orderByAsc("a.jobName");
            }
        }else if(StrUtil.equals(vo.getField(),"certificateNumb")){
            if (StrUtil.equals(vo.getOrder(),"descending")){
                queryWrapper.orderByDesc("a.certificateNumb");
            }else{
                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
@@ -22,4 +22,6 @@
    private String empType;
    private String entryType;
    private String fileName;
    private String field;
    private String order;
}
febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
      config:
        server-addr: ${nacos.url}:8848
        group: DEFAULT_GROUP
        prefix: febs-server-Hr
        prefix: febs-server-hr
        file-extension: yaml
      discovery:
        server-addr: ${nacos.url}:8848