From 6ae35089a05b58dc31c243b9bb4f6a80b20c3a7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 17:44:42 +0800
Subject: [PATCH] 修改接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
index 87d34ef..76952f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.ExperimentDispatchSignDTO;
import com.ruoyi.system.dto.TExperimentDispatchDTO;
@@ -21,7 +20,6 @@
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.*;
@@ -40,7 +38,7 @@
*/
@Api(tags = "实验调度管理")
@RestController
-@RequestMapping("/t-experiment-dispatch")
+@RequestMapping("")
public class TExperimentDispatchController {
private final TExperimentDispatchService experimentDispatchService;
@@ -52,8 +50,9 @@
private final TExperimentDispatchTaskService experimentDispatchTaskService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final TProjectProposalService projectProposalService;
@Autowired
- public TExperimentDispatchController(TExperimentDispatchService experimentDispatchService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentDispatchGroupService experimentDispatchGroupService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchTaskService experimentDispatchTaskService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TExperimentDispatchController(TExperimentDispatchService experimentDispatchService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentDispatchGroupService experimentDispatchGroupService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchTaskService experimentDispatchTaskService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TProjectProposalService projectProposalService) {
this.experimentDispatchService = experimentDispatchService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -63,23 +62,55 @@
this.experimentDispatchTaskService = experimentDispatchTaskService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.projectProposalService = projectProposalService;
}
/**
* 获取实验调度管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:list')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:list')")
@ApiOperation(value = "获取实验调度分页列表",response = TExperimentDispatchQuery.class)
@PostMapping(value = "/api/t-experiment-dispatch/pageList")
public R<PageInfo<TExperimentDispatchVO>> pageList(@RequestBody String param) {
TExperimentDispatchQuery query = JSON.parseObject(param, TExperimentDispatchQuery.class);
+ // 获取当前用户
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if (roleType != 1){
+ query.setUserId(userId);
+ if(roleType ==2){
+ // 查询项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ // 查询项目的工艺工程师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(experimentDispatchService.pageList(query));
}
/**
* 添加实验调度管理
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:add')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:add')")
@Log(title = "实验调度信息-新增实验调度", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加实验调度",response = TExperimentDispatchDTO.class)
@PostMapping(value = "/api/t-experiment-dispatch/add")
@@ -136,7 +167,7 @@
/**
* 修改实验调度
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:edit')")
@Log(title = "实验调度信息-修改实验调度", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改实验调度")
@PostMapping(value = "/api/t-experiment-dispatch/update")
@@ -170,7 +201,7 @@
/**
* 查看实验调度详情
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:detail')")
@ApiOperation(value = "查看实验调度详情")
@GetMapping(value = "/open/t-experiment-dispatch/getDetailById")
public R<TExperimentDispatchVO> getDetailById(@RequestParam String id) {
@@ -178,6 +209,13 @@
TExperimentDispatchVO experimentDispatchVO = new TExperimentDispatchVO();
BeanUtils.copyProperties(experimentDispatch, experimentDispatchVO);
+ // 查询项目课题
+ TProjectProposal proposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ if(Objects.nonNull(proposal)){
+ experimentDispatchVO.setProjectName(proposal.getProjectName());
+ experimentDispatchVO.setProjectCode(proposal.getProjectCode());
+ experimentDispatchVO.setProjectStage(proposal.getProjectStage());
+ }
// 查询组别
experimentDispatchVO.setExperimentDispatchGroups(experimentDispatchGroupService.list(Wrappers.lambdaQuery(TExperimentDispatchGroup.class).eq(TExperimentDispatchGroup::getDispatchId, id)));
// 查询参与人员
@@ -201,9 +239,60 @@
}
/**
+ * 查询化验师的通过签字的实验调度
+ */
+ @ApiOperation(value = "查询化验师的通过签字的实验调度")
+ @GetMapping(value = "/open/t-experiment-dispatch/chemistSignList")
+ public R<List<TExperimentDispatch>> chemistSignList() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 4){
+ return R.fail("您不是化验师，无法查看");
+ }
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getRoleType, roleType)
+ .eq(TExperimentDispatchParticipants::getUserId, userId)
+ .eq(TExperimentDispatchParticipants::getStatus, 2));
+ if(CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ return R.fail("您没有通过签字的实验调度");
+ }
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches = experimentDispatchService.list(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .in(TExperimentDispatch::getId, dispatchIds)
+ .in(TExperimentDispatch::getStatus, 1, 2));
+ List<String> proposalIds = experimentDispatches.stream().map(TExperimentDispatch::getProposalId).collect(Collectors.toList());
+ List<TProjectProposal> list = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class).in(TProjectProposal::getId, proposalIds));
+
+ // 查询参与人员
+ List<String> ids = experimentDispatches.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(ids)){
+ List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .in(TExperimentDispatchParticipants::getDispatchId, ids));
+ List<Long> userIds = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ tExperimentDispatchParticipants.forEach(tExperimentDispatchParticipant -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tExperimentDispatchParticipant.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
+ }
+ });
+ experimentDispatches.forEach(experimentDispatch -> {
+ list.stream().filter(projectProposal -> projectProposal.getId().equals(experimentDispatch.getProposalId())).findFirst().ifPresent(projectProposal -> {
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ });
+ List<TExperimentDispatchParticipants> experimentDispatchParticipantsList = tExperimentDispatchParticipants.stream().filter(tExperimentDispatchParticipant -> tExperimentDispatchParticipant.getDispatchId().equals(experimentDispatch.getId())).collect(Collectors.toList());
+ String participantsName = experimentDispatchParticipantsList.stream().map(TExperimentDispatchParticipants::getNickName).collect(Collectors.joining(";"));
+ experimentDispatch.setParticipantsName(participantsName);
+ });
+ }
+
+ return R.ok(experimentDispatches);
+ }
+
+ /**
* 删除实验调度
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
@Log(title = "实验调度信息-删除实验调度", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除实验调度")
@DeleteMapping(value = "/open/t-experiment-dispatch/deleteById")
@@ -220,7 +309,7 @@
/**
* 批量删除实验调度
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
@Log(title = "实验调度信息-删除实验调度", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除实验调度")
@DeleteMapping(value = "/open/t-experiment-dispatch/deleteByIds")
@@ -237,9 +326,9 @@
/**
* 批量删除实验调度
*/
- @PreAuthorize("@ss.hasPermi('system:experimentDispatch:sign')")
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:sign')")
@Log(title = "实验调度信息-实验调度签字", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "实验调度签字")
+ @ApiOperation(value = "实验调度签字",response = ExperimentDispatchSignDTO.class)
@PostMapping(value = "/api/t-experiment-dispatch/sign")
public R<Boolean> sign(@RequestBody String param) {
ExperimentDispatchSignDTO experimentDispatchSign = JSON.parseObject(param, ExperimentDispatchSignDTO.class);
@@ -256,6 +345,15 @@
experimentDispatchParticipants.setConfirmSign(experimentDispatchSign.getConfirmSign());
experimentDispatchParticipantsService.updateById(experimentDispatchParticipants);
}
+ long count = experimentDispatchParticipantsService.count(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatchSign.getDispatchId())
+ .in(TExperimentDispatchParticipants::getRoleType, 4, 5)
+ .eq(TExperimentDispatchParticipants::getStatus, 1));
+ if(count == 0){
+ TExperimentDispatch tExperimentDispatch = experimentDispatchService.getById(experimentDispatchSign.getDispatchId());
+ tExperimentDispatch.setStatus(2);
+ experimentDispatchService.updateById(tExperimentDispatch);
+ }
return R.ok();
}
--
Gitblit v1.7.1