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/TQaTestItemReportController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 5763010..044b018 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
@@ -107,6 +107,25 @@
}
/**
+ * 获取QA检测项报告管理列表 草稿箱里面的
+ */
+ @ApiOperation(value = "获取QA检测项报告管理下拉列表-化验师使用、评定使用 草稿箱里面的")
+ @GetMapping(value = "/open/t-qa-test-item-report-draft/getListByItemId")
+ public R<List<TQaTestItemReportVO>> getListByItemIdDraft(@RequestParam String itemId) {
+ List<TQaTestItemReportVO> list = qaTestItemReportService.getListByItemIdDraft(itemId);
+ if(!CollectionUtils.isEmpty(list)){
+ List<SysUser> sysUsers = sysUserService.selectList();
+ list.forEach(itemReport -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(itemReport.getAuditPersonId())).findFirst().orElse(null);
+ if(Objects.nonNull(sysUser)){
+ itemReport.setAuditPersonName(sysUser.getNickName());
+ }
+ });
+ }
+ return R.ok(list);
+ }
+
+ /**
* 添加QA检测项报告管理管理
*/
//@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:add')")
@@ -200,6 +219,16 @@
@ApiOperation(value = "删除QA检测项报告管理")
@DeleteMapping(value = "/open/t-qa-test-item-report/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
+ TQaTestItemReport report = qaTestItemReportService.getById(id);
+ if (Objects.isNull(report)) {
+ return R.fail("检测项报告不存在");
+ }
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if (Objects.equals(roleType, 1)
+ && !Objects.equals(report.getStatus(), QATestItemReportStatusEnum.PENDING_APPROVAL.getCode())
+ && !Objects.equals(report.getStatus(), QATestItemReportStatusEnum.PASSED.getCode())) {
+ return R.fail("超级管理员只能删除待审核或已审核的报告");
+ }
// 删除QA检测项报告文件
qaReportFileService.remove(Wrappers.lambdaQuery(TQaReportFile.class).eq(TQaReportFile::getReportId, id)
.in(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
@@ -214,6 +243,17 @@
@ApiOperation(value = "批量删除QA检测项报告管理")
@DeleteMapping(value = "/open/t-qa-test-item-report/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if (Objects.equals(roleType, 1)) {
+ long deletableCount = qaTestItemReportService.count(Wrappers.lambdaQuery(TQaTestItemReport.class)
+ .in(TQaTestItemReport::getId, ids)
+ .in(TQaTestItemReport::getStatus,
+ QATestItemReportStatusEnum.PENDING_APPROVAL.getCode(),
+ QATestItemReportStatusEnum.PASSED.getCode()));
+ if (deletableCount != ids.size()) {
+ return R.fail("超级管理员只能删除待审核或已审核的报告");
+ }
+ }
// 删除QA检测项报告检测报告文件
qaReportFileService.remove(Wrappers.lambdaQuery(TQaReportFile.class).in(TQaReportFile::getReportId, ids)
.in(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
--
Gitblit v1.7.1