提交最新代码

puzhibing

6 天以前 2fa7f761cf80802f54f727381b282d3b264501a7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java

@@ -219,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()));
@@ -233,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()));