From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java | 93 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 81 insertions(+), 12 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 0a528f1..681f46a 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
@@ -2,25 +2,33 @@
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
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.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;
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.model.TProjectProposal;
+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.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;
@@ -43,34 +51,95 @@
private final TProjectProposalService projectProposalService;
private final TokenService tokenService;
private final ISysUserService sysUserService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
@Autowired
- public TProjectProposalController(TProjectProposalService projectProposalService, TokenService tokenService, ISysUserService sysUserService) {
+ public TProjectProposalController(TProjectProposalService projectProposalService, TokenService tokenService, ISysUserService sysUserService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
this.projectProposalService = projectProposalService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
}
/**
* 获取项目课题方案管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:list')")
- @ApiOperation(value = "获取项目课题方案分页列表")
+ //@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);
+ // TODO 获取当前登录人
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())
+ .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")
public R<Boolean> add(@RequestBody String param) {
TProjectProposalDTO dto = JSON.parseObject(param,TProjectProposalDTO.class);
- // TODO 生成项目课题方案编号
+
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法创建项目课题方案");
+ }
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(Objects.isNull(projectTeam)){
+ return R.fail("项目组不存在");
+ }
+ if(projectTeam.getStatus() == 2){
+ return R.fail("项目组已封存,无法创建项目课题方案");
+ }
+ // 生成项目课题方案编号
+ String projectProposalNo = "";
+ switch (dto.getProjectStage()){
+ case 1:
+ projectProposalNo = projectTeam.getTeamName() + "-" + ProjectStageEnum.DEVELOPMENT_PHASE.getCode();
+ break;
+ case 2:
+ projectProposalNo = projectTeam.getTeamName() + "-" + ProjectStageEnum.CHINESE_STYLE_EXPERIMENT.getCode();
+ break;
+ case 3:
+ projectProposalNo = projectTeam.getTeamName() + "-" + ProjectStageEnum.PRODUCTION_VALIDATION.getCode();
+ break;
+ }
+
+ // 查询上个项目课题方案的序号
+ long count = projectProposalService.count(Wrappers.lambdaQuery(TProjectProposal.class)
+ .like(TProjectProposal::getProjectCode, projectProposalNo));
+ projectProposalNo = projectProposalNo + String.format("%02d", count+1);
+ dto.setProjectCode(projectProposalNo);
+ dto.setCommitUserId(userId);
projectProposalService.save(dto);
return R.ok();
}
@@ -78,7 +147,7 @@
/**
* 修改项目课题方案
*/
- @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")
@@ -91,7 +160,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) {
@@ -109,7 +178,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")
@@ -120,7 +189,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")
@@ -131,7 +200,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")
@@ -146,9 +215,9 @@
/**
* 修改项目课题方案
*/
- @PreAuthorize("@ss.hasPermi('system:projectProposal:audit')")
+ //@PreAuthorize("@ss.hasPermi('system:projectProposal:audit')")
@Log(title = "项目课题方案信息-审核项目课题方案", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "审核项目课题方案",response = UpAndDownDTO.class)
+ @ApiOperation(value = "审核项目课题方案",response = AuditStatusDTO.class)
@PostMapping(value = "/api/t-project-proposal/audit")
public R<Boolean> audit(@RequestBody String param) {
Long userId = tokenService.getLoginUser().getUserId();
--
Gitblit v1.7.1