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 | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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..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
@@ -28,6 +28,7 @@
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;
@@ -64,18 +65,39 @@
/**
* 获取项目课题方案管理列表
*/
- @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);
+ // 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")
@@ -117,7 +139,7 @@
.like(TProjectProposal::getProjectCode, projectProposalNo));
projectProposalNo = projectProposalNo + String.format("%02d", count+1);
dto.setProjectCode(projectProposalNo);
-
+ dto.setCommitUserId(userId);
projectProposalService.save(dto);
return R.ok();
}
@@ -125,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")
@@ -138,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) {
@@ -156,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")
@@ -167,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")
@@ -178,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")
@@ -193,7 +215,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