提交最新代码

puzhibing

6 天以前 2fa7f761cf80802f54f727381b282d3b264501a7

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

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QATestItemStatusEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TQaTestItemDTO;
import com.ruoyi.system.dto.TQaTestItemEvaluateDTO;
@@ -79,12 +80,13 @@
            // 查询用户所在项目组
            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);
            }
        }

        return R.ok(qaTestItemService.pageList(query));
    }

@@ -120,6 +122,10 @@
    @PostMapping(value = "/api/t-qa-test-item/add")
    public R<Boolean> add(@RequestBody String param) {
        TQaTestItemDTO dto = JSON.parseObject(param,TQaTestItemDTO.class);

        Long userId = tokenService.getLoginUser().getUserId();
        dto.setCommitPersonId(userId);

        qaTestItemService.save(dto);

        // 查询项目组
@@ -180,6 +186,11 @@
        testItemVO.setQaTestItemReportList(qaTestItemReportVOS);
        // 查询项目组名称
        TProjectTeam projectTeam = projectTeamService.getById(testItemVO.getTeamId());

        if (projectTeam == null) {
            throw new ServiceException("当前数据项目组不存在");
        }

        TProjectTeamVO projectTeamVO = new TProjectTeamVO();
        BeanUtils.copyProperties(projectTeam, projectTeamVO);
        // 查询项目组成员
@@ -213,6 +224,9 @@
    @ApiOperation(value = "删除QA检测项管理")
    @DeleteMapping(value = "/open/t-qa-test-item/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        if (Objects.equals(tokenService.getLoginUser().getUser().getRoleType(), 1)) {
            return R.fail("超级管理员不能删除检测项，只能删除报告");
        }
        // 删除QA检测项管理成员
        qaTestItemReportService.remove(Wrappers.lambdaQuery(TQaTestItemReport.class).eq(TQaTestItemReport::getItemId, id));
        return R.ok(qaTestItemService.removeById(id));
@@ -226,6 +240,9 @@
    @ApiOperation(value = "批量删除QA检测项管理")
    @DeleteMapping(value = "/open/t-qa-test-item/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        if (Objects.equals(tokenService.getLoginUser().getUser().getRoleType(), 1)) {
            return R.fail("超级管理员不能删除检测项，只能删除报告");
        }
        // 删除QA检测项检测报告
        qaTestItemReportService.remove(Wrappers.lambdaQuery(TQaTestItemReport.class).in(TQaTestItemReport::getItemId, ids));
        return R.ok(qaTestItemService.removeByIds(ids));