From 8586161442cbe058fae93bfd35a468485b9b505e Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 30 六月 2025 21:15:46 +0800 Subject: [PATCH] bug修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java index a7f08cc..6d6797e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java @@ -14,10 +14,7 @@ import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.AuditStatusDTO; import com.ruoyi.system.dto.TQaTestItemReportDTO; -import com.ruoyi.system.model.TProjectTeam; -import com.ruoyi.system.model.TProjectTeamStaff; -import com.ruoyi.system.model.TQaReportFile; -import com.ruoyi.system.model.TQaTestItemReport; +import com.ruoyi.system.model.*; import com.ruoyi.system.query.TQaTestItemReportQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.TQaTestItemReportVO; @@ -52,14 +49,18 @@ private final TProjectTeamService projectTeamService; private final TProjectTeamStaffService projectTeamStaffService; private final ISysUserService sysUserService; + private final TQaTestItemService qaTestItemService; + private final TNoticeService noticeService; @Autowired - public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) { + public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TQaTestItemService qaTestItemService, TNoticeService noticeService) { this.qaTestItemReportService = qaTestItemReportService; this.qaReportFileService = qaReportFileService; this.tokenService = tokenService; this.projectTeamService = projectTeamService; this.projectTeamStaffService = projectTeamStaffService; this.sysUserService = sysUserService; + this.qaTestItemService = qaTestItemService; + this.noticeService = noticeService; } /** @@ -248,6 +249,19 @@ testItemReport.setAuditPersonId(userId); testItemReport.setAuditTime(LocalDateTime.now()); qaTestItemReportService.updateById(testItemReport); + + // 查询检测项 + TQaTestItem testItem = qaTestItemService.getById(testItemReport.getItemId()); + // 查询项目组 + TProjectTeam projectTeam = projectTeamService.getById(testItem.getTeamId()); + // MESSAGE 添加消息 + TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class) + .eq(TProjectTeamStaff::getTeamId, projectTeam.getId()) + .eq(TProjectTeamStaff::getRoleType, 3) + .last("LIMIT 1")); + noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【项目检测项、检验包列表】等待评定", tokenService.getLoginUser().getUser().getNickName(),5); + + return R.ok(); } -- Gitblit v1.7.1