bug修改

xuhy

2 天以前 dda2e3f49fe9c942fb6a487204ff8c8e66e46a12

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

@@ -19,6 +19,7 @@
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -42,7 +43,8 @@
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
        List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>()
                .orderByDesc(TResultWorkEvaluate::getEvaluateTime));
                .orderByDesc(TResultWorkEvaluate::getEvaluateTime)
                .isNotNull(TResultWorkEvaluate::getTeamId));
        for (TResultWorkEvaluateVO tResultWorkEvaluateVO : list) {
            List<TResultWorkEvaluate> collect = tResultWorkEvaluates.stream().filter(e ->
//                            e.getEvaluateOne()!=null&&
@@ -227,6 +229,20 @@
    public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        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;
    }
@@ -234,6 +250,21 @@
    public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        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;
    }
@@ -252,9 +283,12 @@
            if(!CollectionUtils.isEmpty(userIds)){
                List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
                for (ResultEvaluateChemistTesterVO resultEvaluateChemistTesterVO : list) {
                    sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(resultEvaluateChemistTesterVO.getParticipantsId())).findFirst().ifPresent(sysUser -> {
                        resultEvaluateChemistTesterVO.setProcessEngineerName(sysUser.getNickName());
                    });
                    TExperimentDispatchParticipants dispatchParticipants = experimentDispatchParticipants.stream().filter(experimentDispatchParticipant -> experimentDispatchParticipant.getDispatchId().equals(resultEvaluateChemistTesterVO.getDispatchId())).findFirst().orElse(null);
                    if(Objects.nonNull(dispatchParticipants)){
                        sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(dispatchParticipants.getUserId())).findFirst().ifPresent(sysUser -> {
                            resultEvaluateChemistTesterVO.setProcessEngineerName(sysUser.getNickName());
                        });
                    }
                }
            }
        }
@@ -276,9 +310,12 @@
            if(!CollectionUtils.isEmpty(userIds)){
                List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
                for (ResultEvaluateChemistTesterVO resultEvaluateChemistTesterVO : list) {
                    sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(resultEvaluateChemistTesterVO.getParticipantsId())).findFirst().ifPresent(sysUser -> {
                        resultEvaluateChemistTesterVO.setProcessEngineerName(sysUser.getNickName());
                    });
                    TExperimentDispatchParticipants dispatchParticipants = experimentDispatchParticipants.stream().filter(experimentDispatchParticipant -> experimentDispatchParticipant.getDispatchId().equals(resultEvaluateChemistTesterVO.getDispatchId())).findFirst().orElse(null);
                    if(Objects.nonNull(dispatchParticipants)){
                        sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(dispatchParticipants.getUserId())).findFirst().ifPresent(sysUser -> {
                            resultEvaluateChemistTesterVO.setProcessEngineerName(sysUser.getNickName());
                        });
                    }
                }
            }
        }