From 7a01f69ca6ebd67142ad556ffac2f2db16ff50e1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 02 七月 2025 18:12:49 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java
index b5e15b4..0f62d12 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java
@@ -1,17 +1,25 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.TFeasibilityStudyReportMapper;
import com.ruoyi.system.model.TFeasibilityStudyReport;
import com.ruoyi.system.query.TFeasibilityStudyReportQuery;
import com.ruoyi.system.service.TFeasibilityStudyReportService;
import com.ruoyi.system.vo.TFeasibilityStudyReportVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -24,10 +32,56 @@
@Service
public class TFeasibilityStudyReportServiceImpl extends ServiceImpl<TFeasibilityStudyReportMapper, TFeasibilityStudyReport> implements TFeasibilityStudyReportService {
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
@Override
public PageInfo<TFeasibilityStudyReportVO> pageList(TFeasibilityStudyReportQuery query) {
PageInfo<TFeasibilityStudyReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
List<TFeasibilityStudyReportVO> list = this.baseMapper.pageList(query,pageInfo);
+
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+
+ List<Long> userIds = list.stream().map(TFeasibilityStudyReportVO::getEvaluatePersonId).collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+
+ // 查询项目组
+ List<String> teamIds = list.stream().map(TFeasibilityStudyReportVO::getTeamId).collect(Collectors.toList());
+ List<TFeasibilityStudyReport> feasibilityStudyReports = this.list(Wrappers.lambdaQuery(TFeasibilityStudyReport.class)
+ .in(TFeasibilityStudyReport::getTeamId, teamIds));
+
+ for (TFeasibilityStudyReportVO tFeasibilityStudyReportVO : list) {
+
+ List<TFeasibilityStudyReport> feasibilityStudyReportList = feasibilityStudyReports.stream()
+ .filter(feasibilityStudyReport -> feasibilityStudyReport.getTeamId().equals(tFeasibilityStudyReportVO.getTeamId())).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(feasibilityStudyReportList)) {
+ tFeasibilityStudyReportVO.setTotalScore(0);
+ continue;
+ }
+ // 将feasibilityStudyReportList列表中所有的分数进行累加
+ List<String> scoreList = feasibilityStudyReportList.stream().filter(e -> StringUtils.isNotBlank(e.getEvaluateScore()))
+ .map(TFeasibilityStudyReport::getEvaluateScore).collect(Collectors.toList());
+
+ // 使用 Stream 累加分数
+ int totalSum = 0;
+ for (String scoreStr : scoreList) {
+ int sum = Arrays.stream(scoreStr.split(","))
+ .mapToInt(Integer::parseInt).sum();
+ totalSum+=sum;
+ }
+ tFeasibilityStudyReportVO.setTotalScore(totalSum);
+
+ sysUsers.stream()
+ .filter(sysUser -> sysUser.getUserId().equals(tFeasibilityStudyReportVO.getEvaluatePersonId()))
+ .findFirst()
+ .ifPresent(sysUser -> tFeasibilityStudyReportVO.setEvaluatePersonName(sysUser.getNickName()));
+ }
+
pageInfo.setRecords(list);
return pageInfo;
}
@@ -59,6 +113,9 @@
@Override
public Map<String, Integer> evaluateCount(TFeasibilityStudyReportQuery query) {
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return new HashMap<>();
+ }
Map<String, Integer> map = this.baseMapper.evaluateCount(query);
return map;
}
--
Gitblit v1.7.1