From ae04ae24862a7ec55504c8d6cd9aaa8adb9b1151 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 08 十二月 2025 16:57:30 +0800
Subject: [PATCH] 实验结果汇报审批驳回，把化验师 QA 专题报告库的审批确认权限从工艺工程师调整为审批人
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
index f35eb12..f2fe0f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TExperimentResultReportDTO;
+import com.ruoyi.system.dto.TExperimentResultReportRejectDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TExperimentResultReportQuery;
@@ -252,6 +253,39 @@
return R.ok();
}
+
+ /**
+ * 驳回实验结果汇报
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:edit')")
+ @Log(title = "实验结果汇报信息-评定工艺工程师实验-驳回实验结果汇报", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "评定工艺工程师实验-驳回实验结果汇报",response = TResultWorkEvaluate.class)
+ @PostMapping(value = "/api/t-experiment-result-report/rejectResult")
+ public R<Boolean> rejectResult(@RequestBody String param) {
+ TExperimentResultReportRejectDTO experimentResultReportRejectDTO = JSON.parseObject(param,TExperimentResultReportRejectDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ // 查询当前用户组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法进行评定");
+ }
+ TProjectTeamStaff projectTeamStaff1 = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 2)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff1)){
+ return R.fail("当前项目组未分配审批人,无法进行评定");
+ }
+ // 查询实验结果汇报
+ TExperimentResultReport experimentResultReport = experimentResultReportService.getById(experimentResultReportRejectDTO.getResultReportId());
+ experimentResultReport.setStatus(1);
+ experimentResultReport.setRejectRemark(experimentResultReportRejectDTO.getRejectRemark());
+ experimentResultReportService.updateById(experimentResultReport);
+ return R.ok();
+ }
+
/**
* 查看实验结果汇报详情
*/
--
Gitblit v1.7.1