实验结果汇报审批驳回，把化验师 QA 专题报告库的审批确认权限从工艺工程师调整为审批人

xuhy

2025-12-08 ae04ae24862a7ec55504c8d6cd9aaa8adb9b1151

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

@@ -210,10 +210,10 @@
        }
        qaReportFileService.saveBatch(qaReportFiles);

        // MESSAGE 添加消息
        // MESSAGE 添加消息   20251208 将qa报告审核转到审批人
        TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
                .eq(TProjectTeamStaff::getRoleType, 3)
                .eq(TProjectTeamStaff::getRoleType, 2)
                .last("LIMIT 1"));
        if(Objects.nonNull(teamStaff)){
            Integer reportType = dto.getReportType();
@@ -272,10 +272,10 @@
        if(dto.getStatus() != -1){
            // 查询项目组
            TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId());
            // MESSAGE 添加消息
            // MESSAGE 添加消息 20251208 将qa报告审核转到审批人
            TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                    .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
                    .eq(TProjectTeamStaff::getRoleType, 3)
                    .eq(TProjectTeamStaff::getRoleType, 2)
                    .last("LIMIT 1"));
            if(Objects.nonNull(teamStaff)){
                TQaProduceReport qaProduceReport = qaProduceReportService.getById(dto.getId());
@@ -405,17 +405,24 @@
        qaProduceReport.setAuditTime(LocalDateTime.now());
        qaProduceReportService.updateById(qaProduceReport);

        // 查询项目组
        TProjectTeam projectTeam = projectTeamService.getById(qaProduceReport.getTeamId());
        // MESSAGE 添加消息 20251208 将qa报告审核转到审批人
        TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
                .eq(TProjectTeamStaff::getRoleType, 3)
                .last("LIMIT 1"));
        // MESSAGE 添加消息
        Integer reportType = qaProduceReport.getReportType();
        switch (reportType) {
            case 1:
                noticeService.saveNotice(userId, "您有【1】条【中试、生产验证分析报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
                noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【中试、生产验证分析报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
                break;
            case 2:
                noticeService.saveNotice(userId, "您有【1】条【辅料报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
                noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【辅料报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
                break;
            case 3:
                noticeService.saveNotice(userId, "您有【1】条【产品报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
                noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【产品报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
                break;
            default:
                break;