From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
index d36b721..78da8de 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
@@ -3,8 +3,12 @@
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.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.TExperimentDispatchParticipantsMapper;
import com.ruoyi.system.mapper.TSamplingRecordMapper;
import com.ruoyi.system.mapper.TSamplingRecordOperationMapper;
+import com.ruoyi.system.model.TExperimentDispatchParticipants;
import com.ruoyi.system.model.TSamplingRecord;
import com.ruoyi.system.model.TSamplingRecordOperation;
import com.ruoyi.system.query.TSamplingRecordQuery;
@@ -30,6 +34,10 @@
@Autowired
private TSamplingRecordOperationMapper samplingRecordOperationMapper;
+ @Autowired
+ private TExperimentDispatchParticipantsMapper experimentDispatchParticipantsMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
@Override
public PageInfo<TSamplingRecordVO> pageList(TSamplingRecordQuery query) {
@@ -49,6 +57,26 @@
item.setReceivedCount(recordOperationList.stream().filter(recordOperation -> recordOperation.getSamplingId().equals(item.getId()) && recordOperation.getStatus() == 3).count());
});
+ // 查询实验调度参与实验员
+ List<String> dispatchIds = list.stream().map(TSamplingRecordVO::getDispatchId).collect(Collectors.toList());
+ List<TExperimentDispatchParticipants> teamStaffs = experimentDispatchParticipantsMapper.selectList(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .in(TExperimentDispatchParticipants::getDispatchId, dispatchIds)
+ .eq(TExperimentDispatchParticipants::getRoleType, 5));
+ List<Long> userIds = teamStaffs.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ teamStaffs.stream().forEach(teamStaff -> {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(teamStaff.getUserId())).findFirst().ifPresent(sysUser -> {
+ teamStaff.setNickName(sysUser.getNickName());
+ });
+ });
+
+ for (TSamplingRecordVO tSamplingRecordVO : list) {
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = teamStaffs.stream().filter(teamStaff -> teamStaff.getDispatchId().equals(tSamplingRecordVO.getDispatchId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ tSamplingRecordVO.setTesterNames(experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getNickName).collect(Collectors.joining(",")));
+ }
+ }
+
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1