From 6f10b63b234bc7b562afdbf954e6b762d8568581 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 16:44:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 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 beec3c6..294fb19 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,7 +9,6 @@
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.uuid.IdUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TProjectProposalDTO;
@@ -18,21 +17,19 @@
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TProjectProposalQuery;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.TProjectProposalService;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TProjectProposalVO;
import io.swagger.annotations.Api;
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.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -52,30 +49,69 @@
private final ISysUserService sysUserService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final TNoticeService noticeService;
@Autowired
- public TProjectProposalController(TProjectProposalService projectProposalService, TokenService tokenService, ISysUserService sysUserService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TProjectProposalController(TProjectProposalService projectProposalService, TokenService tokenService, ISysUserService sysUserService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TNoticeService noticeService) {
this.projectProposalService = projectProposalService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.noticeService = noticeService;
}
/**
* 获取项目课题方案管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:list')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:list')")
@ApiOperation(value = "获取项目课题方案分页列表", response = TProjectProposalQuery.class)
@PostMapping(value = "/api/t-project-proposal/pageList")
public R<PageInfo<TProjectProposalVO>> pageList(@RequestBody String param) {
TProjectProposalQuery query = JSON.parseObject(param, TProjectProposalQuery.class);
+ // 获取当前登录人
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
+ if(roleType != 1){
+ // 查询用户所在项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(projectTeamStaffs.size() > 0){
+ // 查询项目组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));
+ }
+
+ /**
+ * 获取项目课题方案管理列表
+ */
+ @ApiOperation(value = "获取项目课题方案列表")
+ @GetMapping(value = "/open/t-project-proposal/list")
+ public R<List<TProjectProposal>> list(@RequestParam(value = "projectName", required = false) String projectName,
+ @RequestParam(value = "projectCode", required = false) String projectCode) {
+ // 获取当前登录人
+ SysUser user = tokenService.getLoginUser().getUser();
+ if(user.getRoleType() != 3){
+ return R.fail("当前用户非工艺工程师");
+ }
+ List<TProjectProposal> list = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .like(StringUtils.hasLength(projectName),TProjectProposal::getProjectName, projectName)
+ .like(StringUtils.hasLength(projectCode),TProjectProposal::getProjectCode, projectCode)
+ .eq(TProjectProposal::getCommitUserId, user.getUserId())
+ .eq(TProjectProposal::getAuditStatus, 2)
+ .orderByDesc(TProjectProposal::getCreateTime));
+ return R.ok(list);
}
/**
* 添加项目课题方案管理
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:add')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:add')")
@Log(title = "项目课题方案信息-新增项目课题方案", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加项目课题方案",response = TProjectProposalDTO.class)
@PostMapping(value = "/api/t-project-proposal/add")
@@ -117,15 +153,26 @@
.like(TProjectProposal::getProjectCode, projectProposalNo));
projectProposalNo = projectProposalNo + String.format("%02d", count+1);
dto.setProjectCode(projectProposalNo);
-
+ dto.setCommitUserId(userId);
+ dto.setTeamId(projectTeam.getId());
projectProposalService.save(dto);
+
+ // 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();
}
/**
* 修改项目课题方案
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:edit')")
@Log(title = "项目课题方案信息-修改项目课题方案", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改项目课题方案")
@PostMapping(value = "/api/t-project-proposal/update")
@@ -138,7 +185,7 @@
/**
* 查看项目课题方案详情
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:detail')")
@ApiOperation(value = "查看项目课题方案详情")
@GetMapping(value = "/open/t-project-proposal/getDetailById")
public R<TProjectProposalVO> getDetailById(@RequestParam String id) {
@@ -156,7 +203,7 @@
/**
* 删除项目课题方案
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:delete')")
@Log(title = "项目课题方案信息-删除项目课题方案", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除项目课题方案")
@DeleteMapping(value = "/open/t-project-proposal/deleteById")
@@ -167,7 +214,7 @@
/**
* 批量删除项目课题方案
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:delete')")
@Log(title = "项目课题方案信息-删除项目课题方案", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除项目课题方案")
@DeleteMapping(value = "/open/t-project-proposal/deleteByIds")
@@ -178,7 +225,7 @@
/**
* 修改项目课题方案
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:upAndDown')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:upAndDown')")
@Log(title = "项目课题方案信息-修改项目课题方案状态[支持已撤消接口]", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改项目课题方案状态",response = UpAndDownDTO.class)
@PostMapping(value = "/api/t-project-proposal/upAndDown")
@@ -193,7 +240,7 @@
/**
* 修改项目课题方案
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:audit')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:audit')")
@Log(title = "项目课题方案信息-审核项目课题方案", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核项目课题方案",response = AuditStatusDTO.class)
@PostMapping(value = "/api/t-project-proposal/audit")
--
Gitblit v1.7.1