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/TTesterWorkEvaluateServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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 d9fdaf0..59466e8 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;
/**
@@ -40,6 +41,9 @@
@Override
public PageInfo<TResultWorkEvaluateVO> pageList(TResultWorkEvaluateQuery query) {
PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>()
.orderByDesc(TResultWorkEvaluate::getEvaluateTime)
@@ -227,14 +231,49 @@
@Override
public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) {
PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
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;
}
@Override
public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) {
PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
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;
}
@@ -253,9 +292,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());
+ });
+ }
}
}
}
@@ -277,9 +319,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