From ae04ae24862a7ec55504c8d6cd9aaa8adb9b1151 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 08 十二月 2025 16:57:30 +0800
Subject: [PATCH] 实验结果汇报审批驳回，把化验师 QA 专题报告库的审批确认权限从工艺工程师调整为审批人
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
index 294fb19..d3f8b74 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
@@ -80,8 +80,6 @@
// 查询项目组id
List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
query.setTeamIds(teamIds);
- }else{
- return R.fail("当前用户未分配项目组,无法查看项目课题方案");
}
}
return R.ok(projectProposalService.pageList(query));
@@ -179,6 +177,23 @@
public R<Boolean> update(@RequestBody String param) {
TProjectProposalDTO dto = JSON.parseObject(param,TProjectProposalDTO.class);
projectProposalService.updateById(dto);
+ if(dto.getAuditStatus() != -1){
+ // 通过当前用户查询项目组
+ 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(),1);
+ }
+ }
return R.ok();
}
--
Gitblit v1.7.1