提交最新代码

puzhibing

6 天以前 2fa7f761cf80802f54f727381b282d3b264501a7

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

@@ -73,11 +73,12 @@
        TQaTestItemReportQuery query = JSON.parseObject(param, TQaTestItemReportQuery.class);
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if(roleType != 1){
            // 查询用户所在项目组
            List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                    .eq(TProjectTeamStaff::getUserId, userId));
            if(projectTeamStaffs.size() > 0){
            if(!projectTeamStaffs.isEmpty()){
                // 查询项目组id
                List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
                query.setTeamIds(teamIds);
@@ -93,6 +94,25 @@
    @GetMapping(value = "/open/t-qa-test-item-report/getListByItemId")
    public R<List<TQaTestItemReportVO>> getListByItemId(@RequestParam String itemId) {
        List<TQaTestItemReportVO> list = qaTestItemReportService.getListByItemId(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检测项报告管理列表    草稿箱里面的
     */
    @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 -> {
@@ -199,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()));
@@ -213,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()));