修改接口

xuhy

3 天以前 ec213a71112c17cb268ae2c5336348f496e7b3ae

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

@@ -6,6 +6,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.*;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
@@ -16,10 +17,7 @@
import com.ruoyi.system.model.TQaProduceReport;
import com.ruoyi.system.model.TQaReportFile;
import com.ruoyi.system.query.TQaProduceReportQuery;
import com.ruoyi.system.service.TProjectTeamService;
import com.ruoyi.system.service.TProjectTeamStaffService;
import com.ruoyi.system.service.TQaProduceReportService;
import com.ruoyi.system.service.TQaReportFileService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TQaProduceReportVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -50,13 +48,15 @@
    private final TokenService tokenService;
    private final TProjectTeamService projectTeamService;
    private final TProjectTeamStaffService projectTeamStaffService;
    private final ISysUserService sysUserService;
    @Autowired
    public TQaProduceReportController(TQaProduceReportService qaProduceReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
    public TQaProduceReportController(TQaProduceReportService qaProduceReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) {
        this.qaProduceReportService = qaProduceReportService;
        this.qaReportFileService = qaReportFileService;
        this.tokenService = tokenService;
        this.projectTeamService = projectTeamService;
        this.projectTeamStaffService = projectTeamStaffService;
        this.sysUserService = sysUserService;
    }

    /**
@@ -225,6 +225,18 @@
                .eq(TQaReportFile::getReportId, id)
                .ne(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
        qaProduceReportVO.setQaReportFileList(qaReportFiles);
        // 获取项目组名称
        qaProduceReportVO.setTeamName(projectTeamService.getById(qaProduceReport.getTeamId()).getTeamName());
        // 获取审批人名称
        SysUser sysUser = sysUserService.selectUserById(qaProduceReport.getAuditPersonId());
        if (Objects.nonNull(sysUser)) {
            qaProduceReportVO.setAuditPersonName(sysUser.getNickName());
        }
        // 获取评定人名称
        SysUser sysUser1 = sysUserService.selectUserById(qaProduceReport.getEvaluatePersonId());
        if (Objects.nonNull(sysUser1)) {
            qaProduceReportVO.setEvaluatePersonName(sysUser1.getNickName());
        }
        return R.ok(qaProduceReportVO);
    }