Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 bd953391a74b86db829df43992c7cf3c5207634b

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

@@ -6,11 +6,12 @@
import com.ruoyi.system.model.TTesterOtherTask;
import com.ruoyi.system.query.TTesterOtherTaskQuery;
import com.ruoyi.system.service.TTesterOtherTaskService;
import com.ruoyi.system.vo.TQaProduceReportVO;
import com.ruoyi.system.vo.TTesterOtherTaskVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

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

/**
 * <p>
@@ -27,6 +28,18 @@
    public PageInfo<TTesterOtherTaskVO> pageList(TTesterOtherTaskQuery query) {
        PageInfo<TTesterOtherTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TTesterOtherTaskVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
        // 统计总分数
        List<TTesterOtherTask> teamList = this.list();
        for (TTesterOtherTaskVO tTesterOtherTaskVO : list) {
            List<TTesterOtherTask> taskList = teamList.stream().filter(item -> item.getTeamId().equals(tTesterOtherTaskVO.getTeamId())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(taskList)){
                tTesterOtherTaskVO.setTotalScore(0);
            }
            tTesterOtherTaskVO.setTotalScore(taskList.stream().mapToInt(TTesterOtherTask::getEvaluateScore).sum());
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }