乐山实验室
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-05-28 861760a9fc4855e733d1cd0234b3083926914194 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java


@@ -6,25 +6,26 @@


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;


import com.ruoyi.system.dto.TQaProduceReportDTO;


import com.ruoyi.system.dto.TQaProduceReportEvaluateDTO;


import com.ruoyi.system.mapper.SysUserMapper;


import com.ruoyi.system.model.TProjectTeam;


import com.ruoyi.system.model.TProjectTeamStaff;


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.TProjectTeamVO;


import com.ruoyi.system.vo.TQaProduceReportVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.util.CollectionUtils;


import org.springframework.web.bind.annotation.*;




import java.time.LocalDateTime;


@@ -50,13 +51,17 @@


    private final TokenService tokenService;


    private final TProjectTeamService projectTeamService;


    private final TProjectTeamStaffService projectTeamStaffService;


    private final ISysUserService sysUserService;


    private final SysUserMapper sysUserMapper;


    @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, SysUserMapper sysUserMapper) {


        this.qaProduceReportService = qaProduceReportService;


        this.qaReportFileService = qaReportFileService;


        this.tokenService = tokenService;


        this.projectTeamService = projectTeamService;


        this.projectTeamStaffService = projectTeamStaffService;


        this.sysUserService = sysUserService;


        this.sysUserMapper = sysUserMapper;


    }




    /**


@@ -116,6 +121,7 @@


        TQaProduceReportDTO dto = JSON.parseObject(param,TQaProduceReportDTO.class);


        // 通过当前用户查询项目组


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


        String nickName = tokenService.getLoginUser().getUser().getNickName();


        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                .eq(TProjectTeamStaff::getUserId, userId)


                .last("LIMIT 1"));


@@ -149,6 +155,7 @@


                .like(TQaProduceReport::getReportCode, reportCode));


        reportCode = reportCode + "-" + String.format("%03d", count+1);


        dto.setReportCode(reportCode);


        dto.setDevelopPerson(nickName);


        qaProduceReportService.save(dto);


        // 添加检测报告文件


        List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();


@@ -223,6 +230,35 @@


                .eq(TQaReportFile::getReportId, id)


                .ne(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));


        qaProduceReportVO.setQaReportFileList(qaReportFiles);


        // 查询项目组名称


        TProjectTeam projectTeam = projectTeamService.getById(qaProduceReport.getTeamId());


        TProjectTeamVO projectTeamVO = new TProjectTeamVO();


        BeanUtils.copyProperties(projectTeam, projectTeamVO);


        // 查询项目组成员


        List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, qaProduceReport.getTeamId()));


        if (!CollectionUtils.isEmpty(list)){


            List<Long> userIds = list.stream().map(TProjectTeamStaff::getUserId).distinct().collect(Collectors.toList());


            // 查询所有人员


            List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);


            for (TProjectTeamStaff tProjectTeamStaff : list) {


                sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {


                    tProjectTeamStaff.setNickName(sysUser.getNickName());


                    tProjectTeamStaff.setAvatar(sysUser.getAvatar());


                });


            }


            projectTeamVO.setStaffs(list);


        }


        qaProduceReportVO.setProjectTeamVO(projectTeamVO);


        // 获取审批人名称


        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);


    }