From c860cd39213a2e3b54cbe7f0a32d9aa0b8cd16d2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 20 八月 2025 09:31:40 +0800
Subject: [PATCH] 配置修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 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 b406316..0d7ccaa 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
@@ -78,12 +78,16 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
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())
@@ -206,6 +210,15 @@
experimentDispatchTask.setDispatchId(dto.getId());
});
experimentDispatchTaskService.saveBatch(experimentDispatchTasks);
+ // MESSAGE 添加消息
+ if(!dto.getStatus().equals(-1)){
+ experimentDispatchParticipants.stream().filter(e->e.getRoleType().equals(4)).forEach(teamStaff -> {
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验调度】等待确认", tokenService.getLoginUser().getUser().getNickName(),11);
+ });
+ experimentDispatchParticipants.stream().filter(e->e.getRoleType().equals(5)).forEach(teamStaff -> {
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验调度】等待确认", tokenService.getLoginUser().getUser().getNickName(),14);
+ });
+ }
return R.ok();
}
@@ -253,8 +266,9 @@
* 查询化验师的通过签字的实验调度
*/
@ApiOperation(value = "查询化验师的通过签字的实验调度")
- @GetMapping(value = "/open/t-experiment-dispatch/chemistSignList")
- public R<List<TExperimentDispatch>> chemistSignList() {
+ @PostMapping(value = "/api/t-experiment-dispatch/chemistSignList")
+ public R<PageInfo<TExperimentDispatch>> chemistSignList(@RequestBody String param) {
+ TExperimentDispatchQuery query = JSON.parseObject(param, TExperimentDispatchQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
if(roleType != 4){
@@ -268,35 +282,8 @@
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);
- });
- }
-
+ query.setDispatchIds(dispatchIds);
+ PageInfo<TExperimentDispatch> experimentDispatches = experimentDispatchService.chemistSignList(query);
return R.ok(experimentDispatches);
}
--
Gitblit v1.7.1