From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java | 111 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
index ffe8072..b47a4d4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.enums.QAProduceReportStatusEnum;
import com.ruoyi.common.enums.QaReportFileEnum;
import com.ruoyi.common.enums.QaReportTypeEnum;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TQaProduceReportDTO;
@@ -82,6 +83,7 @@
TQaProduceReportQuery query = JSON.parseObject(param, TQaProduceReportQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -210,13 +212,26 @@
}
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)){
- noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【项目检测项、检验包列表】/【中试、生产验证试验检验分析报告】/【原辅料、包材、竞品检验分析报告】/【产品报批及项目工作总结报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ Integer reportType = dto.getReportType();
+ switch (reportType) {
+ case 1:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【中试、生产验证分析报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ break;
+ case 2:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【辅料报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ break;
+ case 3:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【产品报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ break;
+ default:
+ break;
+ }
}
return R.ok();
@@ -231,29 +246,65 @@
@PostMapping(value = "/api/t-qa-produce-report/update")
public R<Boolean> update(@RequestBody String param) {
TQaProduceReportDTO dto = JSON.parseObject(param,TQaProduceReportDTO.class);
+
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ dto.setStatus(null);
+ }
+
qaProduceReportService.updateById(dto);
qaReportFileService.remove(Wrappers.lambdaQuery(TQaReportFile.class)
.eq(TQaReportFile::getReportId, dto.getId()));
// 添加检测报告文件
List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
- for (TQaReportFile qaReportFile : qaReportFiles) {
- qaReportFile.setReportId(dto.getId());
- switch (QaReportFileEnum.fromCode(qaReportFile.getReportType())) {
- case TEST_REPORT:
- qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
- break;
- case PILOT_PRODUCTION_VALIDATION:
- qaReportFile.setReportType(QaReportFileEnum.PILOT_PRODUCTION_VALIDATION.getCode());
- break;
- case RAW_MATERIAL_REPORT:
- qaReportFile.setReportType(QaReportFileEnum.RAW_MATERIAL_REPORT.getCode());
- break;
- case PRODUCT_APPROVAL_REPORT:
- qaReportFile.setReportType(QaReportFileEnum.PRODUCT_APPROVAL_REPORT.getCode());
- break;
+ if (qaReportFiles != null) {
+ for (TQaReportFile qaReportFile : qaReportFiles) {
+ qaReportFile.setReportId(dto.getId());
+ switch (QaReportFileEnum.fromCode(qaReportFile.getReportType())) {
+ case TEST_REPORT:
+ qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
+ break;
+ case PILOT_PRODUCTION_VALIDATION:
+ qaReportFile.setReportType(QaReportFileEnum.PILOT_PRODUCTION_VALIDATION.getCode());
+ break;
+ case RAW_MATERIAL_REPORT:
+ qaReportFile.setReportType(QaReportFileEnum.RAW_MATERIAL_REPORT.getCode());
+ break;
+ case PRODUCT_APPROVAL_REPORT:
+ qaReportFile.setReportType(QaReportFileEnum.PRODUCT_APPROVAL_REPORT.getCode());
+ break;
+ }
+ }
+ qaReportFileService.saveBatch(qaReportFiles);
+ }
+
+
+ if(dto.getStatus() != null && dto.getStatus() != -1){
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId());
+ // MESSAGE 添加消息 20251208 将qa报告审核转到审批人
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 2)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(teamStaff)){
+ TQaProduceReport qaProduceReport = qaProduceReportService.getById(dto.getId());
+ Integer reportType = qaProduceReport.getReportType();
+ switch (reportType) {
+ case 1:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【中试、生产验证分析报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ break;
+ case 2:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【辅料报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ break;
+ case 3:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【产品报告】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ break;
+ default:
+ break;
+ }
}
}
- qaReportFileService.saveBatch(qaReportFiles);
+
return R.ok();
}
@@ -363,8 +414,28 @@
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 添加消息
- noticeService.saveNotice(userId, "您有【1】条【项目检测项、检验包列表】/【中试、生产验证试验检验分析报告】/【原辅料、包材、竞品检验分析报告】/【产品报批及项目工作总结报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),10);
+ Integer reportType = qaProduceReport.getReportType();
+ switch (reportType) {
+ case 1:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【中试、生产验证分析报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ case 2:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【辅料报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ case 3:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【产品报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ default:
+ break;
+ }
return R.ok();
}
--
Gitblit v1.7.1