From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 18 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 912a3e3..b1c7cbc 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
@@ -54,8 +54,9 @@
private final TExperimentDispatchService experimentDispatchService;
private final TProjectProposalService projectProposalService;
private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
+ private final TNoticeService noticeService;
@Autowired
- public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService) {
+ public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TNoticeService noticeService) {
this.testMethodConfirmSheetService = testMethodConfirmSheetService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -67,6 +68,7 @@
this.experimentDispatchService = experimentDispatchService;
this.projectProposalService = projectProposalService;
this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
+ this.noticeService = noticeService;
}
/**
@@ -80,14 +82,33 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
- // 查询实验参与人员
- List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
- .eq(TExperimentDispatchParticipants::getUserId, userId));
- if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
- List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
- query.setDispatchIds(dispatchIds);
+ if(roleType ==2){
+ // 查询项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ // 查询项目的工艺工程师id
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }else {
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, userId));
+ if (!CollectionUtils.isEmpty(experimentDispatchParticipants)) {
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
}
}
return R.ok(testMethodConfirmSheetService.pageList(query));
@@ -102,19 +123,30 @@
@PostMapping(value = "/api/t-test-method-confirm-sheet/add")
public R<Boolean> add(@RequestBody String param) {
TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class);
- testMethodConfirmSheetService.save(dto);
- List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();
- testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {
- testMethodConfirmSheetTerm.setTestId(dto.getId());
- testMethodConfirmSheetTerm.setStatus(1);
- });
- testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
+ Long userId = tokenService.getLoginUser().getUserId();
+
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getOne(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .eq(TExperimentDispatch::getId, dto.getDispatchId()));
+ if(Objects.isNull(experimentDispatch)){
+ return R.fail("实验调度不存在");
+ }
+
+ // 查询调度的参与人员
+ 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"));
// 通过当前用户查询项目组
- 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("当前用户未分配项目组,无法创建项目课题方案");
}
@@ -126,6 +158,15 @@
if(projectTeam.getStatus() == 2){
return R.fail("项目组已封存,无法创建项目课题方案");
}
+
+ dto.setCommitUserId(userId);
+ testMethodConfirmSheetService.save(dto);
+ List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();
+ testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {
+ testMethodConfirmSheetTerm.setTestId(dto.getId());
+ testMethodConfirmSheetTerm.setStatus(1);
+ });
+ testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
// 生成原始记录编号
String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
@@ -141,6 +182,16 @@
testMethodConfirmSheetOriginal.setStatus(1);
testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
}
+
+ // 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();
}
@@ -185,11 +236,22 @@
if(Objects.nonNull(experimentDispatch)){
testMethodConfirmSheetVO.setExperimentName(experimentDispatch.getExperimentName());
testMethodConfirmSheetVO.setExperimentCode(experimentDispatch.getExperimentCode());
+ testMethodConfirmSheetVO.setExperimentStartTime(experimentDispatch.getExperimentStartTime());
+ testMethodConfirmSheetVO.setExperimentEndTime(experimentDispatch.getExperimentEndTime());
+ testMethodConfirmSheetVO.setExperimentDate(experimentDispatch.getExperimentDate());
// 查询项目课题方案
TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
if(Objects.nonNull(projectProposal)){
testMethodConfirmSheetVO.setProjectName(projectProposal.getProjectName());
}
+ // 查询参与人员
+ List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId()));
+ List<Long> userIds = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ String participantsName = sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(";"));
+ testMethodConfirmSheetVO.setParticipantsName(participantsName);
+ testMethodConfirmSheetVO.setStatus(experimentDispatch.getStatus());
}
// 查询审核人姓名
@@ -243,6 +305,11 @@
.set(TTestMethodConfirmSheet::getAuditTime, LocalDateTime.now())
.set(TTestMethodConfirmSheet::getAuditPersonId, userId)
.set(TTestMethodConfirmSheet::getAuditSign, testMethodConfirmSheetSign.getConfirmSign()));
+
+ // MESSAGE 添加消息
+ TTestMethodConfirmSheet testMethodConfirmSheet = testMethodConfirmSheetService.getById(testMethodConfirmSheetSign.getTestMethodConfirmSheetId());
+ noticeService.saveNotice(testMethodConfirmSheet.getCommitUserId(), "您的【检验方案确认单】已被确认", tokenService.getLoginUser().getUser().getNickName(),12);
+
return R.ok();
}
--
Gitblit v1.7.1