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/TTestMethodConfirmSheetController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 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 b1c7cbc..53ba621 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
@@ -89,6 +89,9 @@
// 查询项目组
TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未加入项目组,无法进行操作");
+ }
// 查询项目的工艺工程师id
TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
@@ -205,6 +208,14 @@
public R<Boolean> update(@RequestBody String param) {
TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class);
testMethodConfirmSheetService.updateById(dto);
+ List<TTestMethodConfirmSheetTerm> list = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class)
+ .eq(TTestMethodConfirmSheetTerm::getTestId, dto.getId()));
+ if(!CollectionUtils.isEmpty(list)){
+ List<String> termIds = list.stream().map(TTestMethodConfirmSheetTerm::getId).collect(Collectors.toList());
+ // 删除原始检验记录
+ testMethodConfirmSheetOriginalService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
+ .in(TTestMethodConfirmSheetOriginal::getTermId, termIds));
+ }
testMethodConfirmSheetTermService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class).eq(TTestMethodConfirmSheetTerm::getTestId,dto.getId()));
List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();
testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {
@@ -212,6 +223,47 @@
testMethodConfirmSheetTerm.setStatus(1);
});
testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
+ // 查询调度的参与人员
+ TExperimentDispatchParticipants experimentDispatchParticipant = experimentDispatchParticipantsService.getOne(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, dto.getDispatchId())
+ .eq(TExperimentDispatchParticipants::getRoleType,3)
+ .last("LIMIT 1"));
+ if(Objects.isNull(experimentDispatchParticipant)){
+ return R.fail("项目组工艺工程师未参与该调度");
+ }
+ // 查询工艺工程师所在的项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, experimentDispatchParticipant.getUserId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ // 生成原始记录编号
+ String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
+ String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
+ for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
+ // 添加原始记录
+ TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
+ testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
+ // 查询上个项目课题方案的序号
+ long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
+ .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
+ originalCode = originalCode + String.format("%02d", count+1);
+ testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
+ testMethodConfirmSheetOriginal.setStatus(1);
+ testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
+ }
+
+ if (dto.getAuditStatus() != -1){
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(teamStaff)){
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【检验方法确认单】等待审批", tokenService.getLoginUser().getUser().getNickName(),6);
+ }
+ }
return R.ok();
}
@@ -322,7 +374,7 @@
@PutMapping(value = "/open/t-test-method-confirm-sheet/revokedSheet")
public R<Boolean> revokedSheet(@RequestParam String id) {
TTestMethodConfirmSheet testMethodConfirmSheet = testMethodConfirmSheetService.getById(id);
- testMethodConfirmSheet.setAuditStatus(QATestItemReportStatusEnum.REVOKED.getCode());
+ testMethodConfirmSheet.setAuditStatus(QATestItemReportStatusEnum.DRAFTS.getCode());
testMethodConfirmSheetService.updateById(testMethodConfirmSheet);
return R.ok();
}
--
Gitblit v1.7.1