From 4afcd102fd49874b304ce1ef4ba506c77cc7c397 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 六月 2025 19:32:45 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
index a1865e0..6c4e043 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
+++ b/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&&
@@ -252,9 +254,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 +281,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());
+ });
+ }
}
}
}
--
Gitblit v1.7.1