Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 bd953391a74b86db829df43992c7cf3c5207634b

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

@@ -90,9 +90,17 @@
     */
    @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)
                .eq(TQaTestItemReport::getItemId, itemId));
    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);
    }

@@ -105,16 +113,8 @@
    @PostMapping(value = "/api/t-qa-test-item-report/add")
    public R<Boolean> add(@RequestBody String param) {
        TQaTestItemReportDTO dto = JSON.parseObject(param,TQaTestItemReportDTO.class);
        // 通过当前用户查询项目组
        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());
        TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId());
        if(Objects.isNull(projectTeam)){
            return R.fail("项目组不存在");
        }
@@ -133,11 +133,13 @@
        qaTestItemReportService.save(dto);
        // 添加检测报告文件
        List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
        if(!CollectionUtils.isEmpty(qaReportFiles)){
        for (TQaReportFile qaReportFile : qaReportFiles) {
            qaReportFile.setReportId(dto.getId());
            qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
        }
        qaReportFileService.saveBatch(qaReportFiles);
        }
        return R.ok();
    }

@@ -225,7 +227,7 @@
    @PutMapping(value = "/open/t-qa-test-item-report/revokedReport")
    public R<Boolean> revokedReport(@RequestParam String id) {
        TQaTestItemReport testItemReport = qaTestItemReportService.getById(id);
        testItemReport.setStatus(QATestItemReportStatusEnum.REVOKED.getCode());
        testItemReport.setStatus(QATestItemReportStatusEnum.DRAFTS.getCode());
        qaTestItemReportService.updateById(testItemReport);
        return R.ok();
    }