From 9cb78a5414cdbfdd59931b14759bf9800d275448 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
index 1f26a77..986e677 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
@@ -9,14 +9,17 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QATestItemReportStatusEnum;
import com.ruoyi.common.enums.QaReportFileEnum;
+import com.ruoyi.common.enums.QaReportTypeEnum;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TQaTestItemReportDTO;
-import com.ruoyi.system.mapper.TQaReportFileMapper;
-import com.ruoyi.system.model.TProjectProposal;
+import com.ruoyi.system.model.TProjectTeam;
+import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.model.TQaReportFile;
import com.ruoyi.system.model.TQaTestItemReport;
import com.ruoyi.system.query.TQaTestItemReportQuery;
+import com.ruoyi.system.service.TProjectTeamService;
+import com.ruoyi.system.service.TProjectTeamStaffService;
import com.ruoyi.system.service.TQaReportFileService;
import com.ruoyi.system.service.TQaTestItemReportService;
import com.ruoyi.system.vo.TQaTestItemReportVO;
@@ -24,12 +27,11 @@
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.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Objects;
/**
* <p>
@@ -47,18 +49,22 @@
private final TQaTestItemReportService qaTestItemReportService;
private final TQaReportFileService qaReportFileService;
private final TokenService tokenService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
@Autowired
- public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService) {
+ public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
this.qaTestItemReportService = qaTestItemReportService;
this.qaReportFileService = qaReportFileService;
this.tokenService = tokenService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
}
/**
* 获取QA检测项报告管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:list')")
- @ApiOperation(value = "获取QA检测项报告管理分页列表-工艺工程师使用")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:list')")
+ @ApiOperation(value = "获取QA检测项报告管理分页列表-工艺工程师使用", response = TQaTestItemReportQuery.class)
@PostMapping(value = "/api/t-qa-test-item-report/pageList")
public R<PageInfo<TQaTestItemReportVO>> pageList(@RequestBody String param) {
TQaTestItemReportQuery query = JSON.parseObject(param, TQaTestItemReportQuery.class);
@@ -68,7 +74,7 @@
/**
* 获取QA检测项报告管理列表
*/
- @ApiOperation(value = "获取QA检测项报告管理下拉列表-化验师使用")
+ @ApiOperation(value = "获取QA检测项报告管理下拉列表-化验师使用、评定使用")
@GetMapping(value = "/open/t-qa-test-item-report/getListByItemId")
public R<List<TQaTestItemReport>> getListByItemId(@RequestParam String itemId) {
List<TQaTestItemReport> list = qaTestItemReportService.list(Wrappers.lambdaQuery(TQaTestItemReport.class)
@@ -79,13 +85,37 @@
/**
* 添加QA检测项报告管理管理
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:add')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:add')")
@Log(title = "QA检测项报告管理信息-新增QA检测项报告管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加QA检测项报告管理",response = TQaTestItemReportDTO.class)
@PostMapping(value = "/api/t-qa-test-item-report/add")
public R<Boolean> add(@RequestBody String param) {
TQaTestItemReportDTO dto = JSON.parseObject(param,TQaTestItemReportDTO.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 reportCode = projectTeam.getTeamName() + "-" + QaReportTypeEnum.TEST_REPORT.getCode();
+
+ // 查询上个项目课题方案的序号
+ long count = qaTestItemReportService.count(Wrappers.lambdaQuery(TQaTestItemReport.class)
+ .like(TQaTestItemReport::getReportCode, reportCode));
+ reportCode = reportCode + "-" + String.format("%03d", count+1);
+ dto.setReportCode(reportCode);
+
qaTestItemReportService.save(dto);
// 添加检测报告文件
List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
@@ -100,7 +130,7 @@
/**
* 修改QA检测项报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:edit')")
@Log(title = "QA检测项报告管理信息-修改QA检测项报告管理", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改QA检测项报告管理")
@PostMapping(value = "/api/t-qa-test-item-report/update")
@@ -122,7 +152,7 @@
/**
* 查看QA检测项报告管理详情
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:detail')")
@ApiOperation(value = "查看QA检测项报告管理详情")
@GetMapping(value = "/open/t-qa-test-item-report/getDetailById")
public R<TQaTestItemReportVO> getDetailById(@RequestParam String id) {
@@ -140,7 +170,7 @@
/**
* 删除QA检测项报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:delete')")
@Log(title = "QA检测项报告管理信息-删除QA检测项报告管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除QA检测项报告管理")
@DeleteMapping(value = "/open/t-qa-test-item-report/deleteById")
@@ -154,7 +184,7 @@
/**
* 批量删除QA检测项报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:delete')")
@Log(title = "QA检测项报告管理信息-删除QA检测项报告管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除QA检测项报告管理")
@DeleteMapping(value = "/open/t-qa-test-item-report/deleteByIds")
@@ -168,7 +198,7 @@
/**
* 撤销QA检测项报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:revokedReport')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:revokedReport')")
@Log(title = "QA检测项报告管理信息-撤销QA检测项报告管理状态", businessType = BusinessType.UPDATE)
@ApiOperation(value = "撤销QA检测项报告管理状态")
@PutMapping(value = "/open/t-qa-test-item-report/revokedReport")
@@ -182,7 +212,7 @@
/**
* 审核QA检测项报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:qaTestItemReport:auditReport')")
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:auditReport')")
@Log(title = "QA检测项报告管理信息-审核QA检测项报告管理状态", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核QA检测项报告管理状态")
@PostMapping(value = "/api/t-qa-test-item-report/auditReport")
--
Gitblit v1.7.1