From 2fa7f761cf80802f54f727381b282d3b264501a7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 十月 2026 11:11:26 +0800
Subject: [PATCH] 提交最新代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java | 202 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 170 insertions(+), 32 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 9a46fdc..95c1363 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
@@ -25,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -51,8 +52,11 @@
private final TExperimentDispatchService experimentDispatchService;
private final TProjectProposalService projectProposalService;
private final TExperimentDispatchGroupService experimentDispatchGroupService;
+ private final TProjectTeamStaffService projectTeamStaffService;
+ private final TProjectTeamService projectTeamService;
+ private final TNoticeService noticeService;
@Autowired
- public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService) {
+ public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TNoticeService noticeService) {
this.experimentSchemeService = experimentSchemeService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -62,6 +66,9 @@
this.experimentDispatchService = experimentDispatchService;
this.projectProposalService = projectProposalService;
this.experimentDispatchGroupService = experimentDispatchGroupService;
+ this.projectTeamStaffService = projectTeamStaffService;
+ this.projectTeamService = projectTeamService;
+ this.noticeService = noticeService;
}
/**
@@ -75,14 +82,36 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
- // 查询实验参与人员
- List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
- .eq(TExperimentDispatchParticipants::getUserId, userId));
- if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
- List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
- query.setDispatchIds(dispatchIds);
+ if(roleType ==2){
+ // 查询项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未加入项目组,无法进行操作");
+ }
+ // 查询项目的工艺工程师id
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }else {
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, userId));
+ if (!CollectionUtils.isEmpty(experimentDispatchParticipants)) {
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
}
}
return R.ok(experimentSchemeService.pageList(query));
@@ -98,14 +127,36 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
- // 查询实验参与人员
- List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
- .eq(TExperimentDispatchParticipants::getUserId, userId));
- if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
- List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
- query.setDispatchIds(dispatchIds);
+ if(roleType ==2){
+ // 查询项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未加入项目组,无法进行操作");
+ }
+ // 查询项目的工艺工程师id
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }else {
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, userId));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
}
}
return R.ok(experimentSchemeService.auditPageList(query));
@@ -128,6 +179,7 @@
if(sysUser != null){
tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());
+ tExperimentDispatchParticipant.setCreateTime(sysUser.getCreateTime());
}
});
}
@@ -172,14 +224,21 @@
@PostMapping(value = "/api/t-experiment-scheme/update")
public R<Boolean> update(@RequestBody String param) {
TExperimentSchemeDTO dto = JSON.parseObject(param,TExperimentSchemeDTO.class);
+
+ if (Objects.equals(tokenService.getLoginUser().getUser().getRoleType(), 1)){
+ dto.setStatus(null);
+ }
+
experimentSchemeService.updateById(dto);
experimentSchemePersonService.remove(Wrappers.lambdaQuery(TExperimentSchemePerson.class).eq(TExperimentSchemePerson::getSchemeId,dto.getId()));
List<TExperimentSchemePerson> experimentSchemePersons = dto.getExperimentSchemePersons();
- experimentSchemePersons.forEach(experimentSchemePerson -> {
- experimentSchemePerson.setSchemeId(dto.getId());
- experimentSchemePerson.setCommitTime(LocalDateTime.now());
- });
- experimentSchemePersonService.saveBatch(experimentSchemePersons);
+ if (experimentSchemePersons != null) {
+ experimentSchemePersons.forEach(experimentSchemePerson -> {
+ experimentSchemePerson.setSchemeId(dto.getId());
+ experimentSchemePerson.setCommitTime(LocalDateTime.now());
+ });
+ experimentSchemePersonService.saveBatch(experimentSchemePersons);
+ }
return R.ok();
}
@@ -192,8 +251,24 @@
@PostMapping(value = "/api/t-experiment-scheme/updateTester")
public R<Boolean> updateTester(@RequestBody String param) {
TExperimentSchemeDTO dto = JSON.parseObject(param,TExperimentSchemeDTO.class);
- dto.setStatus(6);
experimentSchemeService.updateById(dto);
+
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(teamStaff)){
+ noticeService.saveNotice(teamStaff.getUserId(), "实验员已提交实验方案，请查收！", tokenService.getLoginUser().getUser().getNickName(),8);
+ }
+
return R.ok();
}
@@ -208,6 +283,22 @@
TExperimentSchemeVO experimentSchemeVO = new TExperimentSchemeVO();
BeanUtils.copyProperties(experimentScheme, experimentSchemeVO);
+ // 获取实验人员
+ List<TExperimentSchemePerson> experimentSchemePersons = experimentSchemePersonService.list(Wrappers.lambdaQuery(TExperimentSchemePerson.class)
+ .eq(TExperimentSchemePerson::getSchemeId, id));
+ List<Long> userIds = experimentSchemePersons.stream().map(TExperimentSchemePerson::getUserId).collect(Collectors.toList());
+
+ if (!userIds.isEmpty()) {
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ sysUsers.forEach(sysUser -> {
+ experimentSchemePersons.stream().filter(experimentSchemePerson -> experimentSchemePerson.getUserId().equals(sysUser.getUserId())).forEach(experimentSchemePerson -> {
+ experimentSchemePerson.setNickName(sysUser.getNickName());
+ experimentSchemePerson.setAvatar(sysUser.getAvatar());
+ });
+ });
+ }
+
+ experimentSchemeVO.setExperimentSchemePersons(experimentSchemePersons);
// 查询实验调度信息
TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentSchemeVO.getDispatchId());
if(Objects.nonNull(experimentDispatch)){
@@ -217,6 +308,13 @@
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);
@@ -224,19 +322,6 @@
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));
- List<Long> userIds = experimentSchemePersons.stream().map(TExperimentSchemePerson::getUserId).collect(Collectors.toList());
- List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
- sysUsers.forEach(sysUser -> {
- experimentSchemePersons.stream().filter(experimentSchemePerson -> experimentSchemePerson.getUserId().equals(sysUser.getUserId())).forEach(experimentSchemePerson -> {
- experimentSchemePerson.setNickName(sysUser.getNickName());
- experimentSchemePerson.setAvatar(sysUser.getAvatar());
- });
- });
- experimentSchemeVO.setExperimentSchemePersons(experimentSchemePersons);
// 查询审核人姓名
SysUser sysUser = sysUserService.selectUserById(experimentScheme.getAuditPersonId());
@@ -282,16 +367,69 @@
@PostMapping(value = "/api/t-experiment-scheme/applicationTermination")
public R<Boolean> applicationTermination(@RequestBody String param) {
ApplicationTerminationDTO applicationTerminationDTO = JSON.parseObject(param, ApplicationTerminationDTO.class);
+ TExperimentScheme currentScheme = experimentSchemeService.getById(applicationTerminationDTO.getId());
+ if (Objects.isNull(currentScheme)) {
+ return R.fail("实验方案不存在");
+ }
+ Integer oldStatus = currentScheme.getOldStatus();
+ if (!Arrays.asList(2, 3, 4).contains(currentScheme.getStatus())) {
+ oldStatus = currentScheme.getStatus();
+ }
experimentSchemeService.update(Wrappers.lambdaUpdate(TExperimentScheme.class)
.eq(TExperimentScheme::getId, applicationTerminationDTO.getId())
.set(TExperimentScheme::getStatus, 2)
+ .set(TExperimentScheme::getOldStatus, oldStatus)
.set(TExperimentScheme::getStopReason, applicationTerminationDTO.getStopReason())
.set(TExperimentScheme::getStopFile, applicationTerminationDTO.getStopFile())
.set(TExperimentScheme::getStopFileName, applicationTerminationDTO.getStopFileName())
.set(TExperimentScheme::getCommitSign, applicationTerminationDTO.getCommitSign()));
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 2)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(teamStaff)){
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验方案中止申请】等待审批", tokenService.getLoginUser().getUser().getNickName(),2);
+ }
+
return R.ok();
}
+ @Log(title = "实验方案信息-删除中止申请", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除中止申请（保留实验方案）")
+ @DeleteMapping(value = "/open/t-experiment-scheme/deleteTerminationApplication")
+ public R<Boolean> deleteTerminationApplication(@RequestParam String id) {
+ if (tokenService.getLoginUser().getUser().getRoleType() != 1) {
+ return R.fail("仅管理员可以删除中止申请");
+ }
+ TExperimentScheme scheme = experimentSchemeService.getById(id);
+ if (Objects.isNull(scheme)) {
+ return R.fail("实验方案不存在");
+ }
+ if (!Arrays.asList(2, 3).contains(scheme.getStatus())) {
+ return R.fail("仅待审核或已通过的实验中止审批可以删除");
+ }
+ Integer restoredStatus = scheme.getOldStatus() == null ? 6 : scheme.getOldStatus();
+ return R.ok(experimentSchemeService.update(Wrappers.lambdaUpdate(TExperimentScheme.class)
+ .eq(TExperimentScheme::getId, id)
+ .set(TExperimentScheme::getStatus, restoredStatus)
+ .set(TExperimentScheme::getStopReason, null)
+ .set(TExperimentScheme::getStopFile, null)
+ .set(TExperimentScheme::getStopFileName, null)
+ .set(TExperimentScheme::getCommitSign, null)
+ .set(TExperimentScheme::getAuditPersonId, null)
+ .set(TExperimentScheme::getAuditTime, null)
+ .set(TExperimentScheme::getAuditRemark, null)
+ .set(TExperimentScheme::getOldStatus, null)));
+ }
+
/**
* 批量删除实验方案
*/
--
Gitblit v1.7.1