bug修改

xuhy

3 天以前 6bf77f70ff3396fc1b7050c9454225523f506b1f

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

@@ -41,6 +41,9 @@
    @Override
    public PageInfo<TResultWorkEvaluateVO> pageList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
        List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>()
                .orderByDesc(TResultWorkEvaluate::getEvaluateTime)
@@ -228,14 +231,49 @@
    @Override
    public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TResultWorkEvaluateVO> list = this.baseMapper.chemistEvaluateList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
        }

        List<Long> userIds = list.stream().map(TResultWorkEvaluateVO::getUserId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(userIds)){
            List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
            list.forEach(tResultWorkEvaluateVO -> {
                SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tResultWorkEvaluateVO.getUserId())).findFirst().orElse(null);
                if(sysUser != null){
                    tResultWorkEvaluateVO.setChemistName(sysUser.getNickName());
                }
            });
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
    @Override
    public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TResultWorkEvaluateVO> list = this.baseMapper.testerEvaluateList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
        }

        List<Long> userIds = list.stream().map(TResultWorkEvaluateVO::getUserId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(userIds)){
            List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
            list.forEach(tResultWorkEvaluateVO -> {
                SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tResultWorkEvaluateVO.getUserId())).findFirst().orElse(null);
                if(sysUser != null){
                    tResultWorkEvaluateVO.setTesterName(sysUser.getNickName());
                }
            });
        }

        pageInfo.setRecords(list);
        return pageInfo;
    }