From 6f10b63b234bc7b562afdbf954e6b762d8568581 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 16:44:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
index 9fac33e..5fed8d8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
@@ -81,6 +81,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
if(roleType ==2){
@@ -122,6 +123,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
// 查询实验参与人员
@@ -152,6 +154,7 @@
if(sysUser != null){
tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());
+ tExperimentDispatchParticipant.setCreateTime(sysUser.getCreateTime());
}
});
}
@@ -249,23 +252,6 @@
TExperimentSchemeVO experimentSchemeVO = new TExperimentSchemeVO();
BeanUtils.copyProperties(experimentScheme, experimentSchemeVO);
- // 查询实验调度信息
- TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentSchemeVO.getDispatchId());
- if(Objects.nonNull(experimentDispatch)){
- // 查询课题方案名称
- TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
- if(Objects.nonNull(projectProposal)){
- experimentDispatch.setProjectName(projectProposal.getProjectName());
- experimentDispatch.setProjectCode(projectProposal.getProjectCode());
- }
- }
- experimentSchemeVO.setExperimentDispatch(experimentDispatch);
-
- // 查询组别
- List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
- .eq(TExperimentDispatchParticipants::getDispatchId, experimentSchemeVO.getDispatchId()));
- experimentSchemeVO.setExperimentDispatchParticipants(list);
-
// 获取实验人员
List<TExperimentSchemePerson> experimentSchemePersons = experimentSchemePersonService.list(Wrappers.lambdaQuery(TExperimentSchemePerson.class)
.eq(TExperimentSchemePerson::getSchemeId, id));
@@ -278,6 +264,29 @@
});
});
experimentSchemeVO.setExperimentSchemePersons(experimentSchemePersons);
+ // 查询实验调度信息
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentSchemeVO.getDispatchId());
+ if(Objects.nonNull(experimentDispatch)){
+ // 查询课题方案名称
+ TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ if(Objects.nonNull(projectProposal)){
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ experimentDispatch.setProjectCode(projectProposal.getProjectCode());
+ }
+ // 查询参与人员
+ List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId()));
+ List<Long> userIds1 = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
+ List<SysUser> sysUsers1 = sysUserMapper.selectUserByIds(userIds1);
+ String participantsName = sysUsers1.stream().map(SysUser::getNickName).collect(Collectors.joining(";"));
+ experimentDispatch.setParticipantsName(participantsName);
+ }
+ experimentSchemeVO.setExperimentDispatch(experimentDispatch);
+
+ // 查询组别
+ List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentSchemeVO.getDispatchId()));
+ experimentSchemeVO.setExperimentDispatchParticipants(list);
// 查询审核人姓名
SysUser sysUser = sysUserService.selectUserById(experimentScheme.getAuditPersonId());
--
Gitblit v1.7.1