From 6ea5493a8ca2b3231e482fda98b1388af1e7f9ff Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 五月 2025 11:03:40 +0800
Subject: [PATCH] 项目总积分
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 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 3a86a7d..92d8b8e 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
@@ -6,15 +6,14 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.ApplicationTerminationAuditDTO;
import com.ruoyi.system.dto.ApplicationTerminationDTO;
import com.ruoyi.system.dto.TExperimentSchemeDTO;
-import com.ruoyi.system.dto.TestMethodConfirmSheetSignDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.*;
-import com.ruoyi.system.query.TExperimentResultReportQuery;
import com.ruoyi.system.query.TExperimentSchemeQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TExperimentSchemeVO;
@@ -22,12 +21,13 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -50,8 +50,9 @@
private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
private final TExperimentDispatchService experimentDispatchService;
private final TProjectProposalService projectProposalService;
+ private final TExperimentDispatchGroupService experimentDispatchGroupService;
@Autowired
- public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService) {
+ public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService) {
this.experimentSchemeService = experimentSchemeService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -60,12 +61,13 @@
this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
this.experimentDispatchService = experimentDispatchService;
this.projectProposalService = projectProposalService;
+ this.experimentDispatchGroupService = experimentDispatchGroupService;
}
/**
* 获取实验方案管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:list')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:list')")
@ApiOperation(value = "获取实验方案分页列表",response = TExperimentSchemeQuery.class)
@PostMapping(value = "/api/t-experiment-scheme/pageList")
public R<PageInfo<TExperimentSchemeVO>> pageList(@RequestBody String param) {
@@ -76,18 +78,40 @@
/**
* 通过实验调度查询查询组别列表
*/
+ @ApiOperation(value = "通过实验调度查询实验人员")
+ @GetMapping(value = "/open/t-experiment-scheme/getParticipantsByDispatchId")
+ public R<List<TExperimentDispatchParticipants>> getParticipantsByDispatchId(@RequestParam String dispatchId) {
+ List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, dispatchId)
+ .eq(TExperimentDispatchParticipants::getRoleType,5));
+ if(!CollectionUtils.isEmpty(list)){
+ List<Long> userIds = list.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ list.forEach(tExperimentDispatchParticipant -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tExperimentDispatchParticipant.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
+ tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());
+ }
+ });
+ }
+ return R.ok(list);
+ }
+ /**
+ * 通过实验调度查询查询组别列表
+ */
@ApiOperation(value = "通过实验调度查询查询组别列表")
@GetMapping(value = "/open/t-experiment-scheme/getGroupByDispatchId")
- public R<List<TExperimentDispatchParticipants>> getGroupByDispatchId(@RequestParam String dispatchId) {
- List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
- .eq(TExperimentDispatchParticipants::getDispatchId, dispatchId));
+ public R<List<TExperimentDispatchGroup>> getGroupByDispatchId(@RequestParam String dispatchId) {
+ List<TExperimentDispatchGroup> list = experimentDispatchGroupService.list(Wrappers.lambdaQuery(TExperimentDispatchGroup.class)
+ .eq(TExperimentDispatchGroup::getDispatchId, dispatchId));
return R.ok(list);
}
/**
* 添加实验方案管理
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:add')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:add')")
@Log(title = "实验方案信息-新增实验方案", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加实验方案",response = TExperimentSchemeDTO.class)
@PostMapping(value = "/api/t-experiment-scheme/add")
@@ -106,7 +130,7 @@
/**
* 修改实验方案
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:edit')")
@Log(title = "实验方案信息-修改实验方案", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改实验方案")
@PostMapping(value = "/api/t-experiment-scheme/update")
@@ -126,7 +150,7 @@
/**
* 查看实验方案详情
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:detail')")
@ApiOperation(value = "查看实验方案详情")
@GetMapping(value = "/open/t-experiment-scheme/getDetailById")
public R<TExperimentSchemeVO> getDetailById(@RequestParam String id) {
@@ -161,7 +185,7 @@
/**
* 删除实验方案
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:delete')")
@Log(title = "实验方案信息-删除实验方案", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除实验方案")
@DeleteMapping(value = "/open/t-experiment-scheme/deleteById")
@@ -174,7 +198,7 @@
/**
* 批量删除实验方案
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:delete')")
@Log(title = "实验方案信息-删除实验方案", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除实验方案")
@DeleteMapping(value = "/open/t-experiment-scheme/deleteByIds")
@@ -187,7 +211,7 @@
/**
* 批量删除实验方案
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:sign')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:sign')")
@Log(title = "实验方案信息-申请中止实验", businessType = BusinessType.UPDATE)
@ApiOperation(value = "申请中止实验")
@PostMapping(value = "/api/t-experiment-scheme/applicationTermination")
@@ -206,7 +230,7 @@
/**
* 批量删除实验方案
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:audit')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:audit')")
@Log(title = "实验方案信息-申请中止实验审核", businessType = BusinessType.UPDATE)
@ApiOperation(value = "申请中止实验审核")
@PostMapping(value = "/api/t-experiment-scheme/audit")
--
Gitblit v1.7.1