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/TTestMethodConfirmSheetController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
index d949d54..a8a1e74 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QATestItemReportStatusEnum;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TTestMethodConfirmSheetDTO;
import com.ruoyi.system.dto.TestMethodConfirmSheetSignDTO;
@@ -207,7 +208,12 @@
@ApiOperation(value = "修改检验方法确认单")
@PostMapping(value = "/api/t-test-method-confirm-sheet/update")
public R<Boolean> update(@RequestBody String param) {
- TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class);
+ TTestMethodConfirmSheetDTO dto = JSON.parseObject(param, TTestMethodConfirmSheetDTO.class);
+
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ dto.setAuditStatus(null);
+ }
+
testMethodConfirmSheetService.updateById(dto);
List<TTestMethodConfirmSheetTerm> list = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class)
.eq(TTestMethodConfirmSheetTerm::getTestId, dto.getId()));
@@ -221,7 +227,9 @@
List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();
testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {
testMethodConfirmSheetTerm.setTestId(dto.getId());
- testMethodConfirmSheetTerm.setStatus(1);
+ if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ testMethodConfirmSheetTerm.setStatus(1);
+ }
});
testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
// 查询调度的参与人员
@@ -255,7 +263,7 @@
// testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
// }
- if (dto.getAuditStatus() != -1){
+ if (dto.getAuditStatus() != null && dto.getAuditStatus() != -1){
// MESSAGE 添加消息
TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
@@ -393,7 +401,7 @@
originalCode = originalCode + String.format("%02d", count+1);
testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
testMethodConfirmSheetOriginal.setStatus(1);
- testMethodConfirmSheetOriginal.setCommitUserId(userId);
+ testMethodConfirmSheetOriginal.setCommitUserId(testMethodConfirmSheet.getCommitUserId());
testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
}
}
--
Gitblit v1.7.1