From 6bf77f70ff3396fc1b7050c9454225523f506b1f Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 01 七月 2025 09:20:08 +0800 Subject: [PATCH] bug修改 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java index 01509ba..cf1bb85 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java +++ b/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> @@ -26,7 +27,22 @@ @Override public PageInfo<TTesterOtherTaskVO> pageList(TTesterOtherTaskQuery query) { PageInfo<TTesterOtherTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + if(CollectionUtils.isEmpty(query.getTeamIds())){ + return pageInfo; + } 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; } -- Gitblit v1.7.1