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/TProjectProposalController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 4953a2f..8c96897 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
@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.ProjectStageEnum;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TProjectProposalDTO;
@@ -80,8 +81,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));
@@ -151,7 +150,7 @@
// 查询上个项目课题方案的序号
long count = projectProposalService.count(Wrappers.lambdaQuery(TProjectProposal.class)
.like(TProjectProposal::getProjectCode, projectProposalNo));
- projectProposalNo = projectProposalNo + String.format("%02d", count+1);
+ projectProposalNo = projectProposalNo + String.format("%03d", count+1);
dto.setProjectCode(projectProposalNo);
dto.setCommitUserId(userId);
dto.setTeamId(projectTeam.getId());
@@ -178,22 +177,30 @@
@PostMapping(value = "/api/t-project-proposal/update")
public R<Boolean> update(@RequestBody String param) {
TProjectProposalDTO dto = JSON.parseObject(param,TProjectProposalDTO.class);
+
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ dto.setAuditStatus(null);
+ }
+
projectProposalService.updateById(dto);
- if(dto.getAuditStatus() != -1){
+ if(dto.getAuditStatus() != null && 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);
+
+ if (projectTeamStaff != null && !com.ruoyi.common.utils.StringUtils.isEmpty(projectTeamStaff.getTeamId())) {
+ // 查询项目组
+ 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