保洁巡检所有代码

无关风月

7 天以前 53d014edd19f57125c355abe71ec5b478500e610

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java

@@ -45,6 +45,7 @@
    private SysUserMapper sysUserMapper;
    @Override
    public PageInfo<LeaveListVO> pageList(LeaveListQuery query) {
        List<SysUser> sysUsers = sysUserMapper.selectAllList();
        if (StringUtils.hasLength(query.getDeptName())){
            List<String> collect = projectDeptMapper.selectList(new LambdaQueryWrapper<TProjectDept>().like(TProjectDept::getProjectName, query.getDeptName()))
                    .stream().map(TProjectDept::getId).collect(Collectors.toList());
@@ -60,20 +61,31 @@
        PageInfo<LeaveListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<LeaveListVO> list = this.baseMapper.pageList(query,pageInfo);
        for (LeaveListVO leaveListVO : list) {
            SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(leaveListVO.getAuditId()))).findFirst().orElse(null);
            if (sysUser!=null){
                leaveListVO.setAuditName(sysUser.getNickName());
            }
            String start = leaveListVO.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
            String end = leaveListVO.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
            leaveListVO.setLeaveTime(start+"至"+end);
            if (leaveListVO.getDeptType() == 1){
                TProjectDept tProjectDept = projectDeptMapper.selectById(leaveListVO.getDeptId());
                if (!tProjectDept.getParentId().equals("0")){
                if (tProjectDept!=null&&!"0".equals(tProjectDept.getParentId())){
                    TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                    leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                    if (tProjectDept1!=null){
                        leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                    }
                }else{
                    leaveListVO.setDeptName(tProjectDept.getProjectName());
                    if (tProjectDept!=null){
                        leaveListVO.setDeptName(tProjectDept.getProjectName());
                    }
                }
            }else{
                TDept tDept = deptMapper.selectById(leaveListVO.getDeptId());
                leaveListVO.setDeptName(tDept.getDeptName());
                if (tDept!=null){
                    leaveListVO.setDeptName(tDept.getDeptName());

                }
            }
        }
        pageInfo.setRecords(list);