From 8f55b92a5a936d3358bb8a9f2fe67c697ba99be0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 15:09:46 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
index 7a77c60..5214c19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
@@ -21,9 +21,9 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -46,10 +46,13 @@
private final TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService;
private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final TProjectTeamService projectTeamService;
private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
private final TInspectionReportService inspectionReportService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TProjectProposalService projectProposalService;
@Autowired
- public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TInspectionReportService inspectionReportService) {
+ public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TInspectionReportService inspectionReportService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService) {
this.tokenService = tokenService;
this.sysUserService = sysUserService;
this.sysUserMapper = sysUserMapper;
@@ -57,15 +60,18 @@
this.testMethodConfirmSheetOriginalDataService = testMethodConfirmSheetOriginalDataService;
this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.projectTeamService = projectTeamService;
this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
this.inspectionReportService = inspectionReportService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.projectProposalService = projectProposalService;
}
/**
- * 获取检验方法确认单管理列表
+ * 获取检验方法确认单原始检测项分页列表
*/
//@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
- @ApiOperation(value = "获取检验方法确认单分页列表", notes = "获取检验方法确认单分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
+ @ApiOperation(value = "获取检验方法确认单原始检测项分页列表", notes = "获取检验方法确认单原始检测项分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
@PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList")
public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) {
TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class);
@@ -78,6 +84,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())
@@ -100,25 +109,42 @@
}
}
if(roleType == 4){
- // 查询检验报告
- List<TInspectionReport> inspectionReports = inspectionReportService.list(Wrappers.lambdaQuery(TInspectionReport.class)
- .eq(TInspectionReport::getStatus, 1));
- if (!CollectionUtils.isEmpty(inspectionReports)) {
- List<String> dispatchIds = inspectionReports.stream().map(TInspectionReport::getDispatchId).distinct().collect(Collectors.toList());
- List<String> dispatchIds1 = query.getDispatchIds();
- Iterator<String> iterator = dispatchIds1.iterator();
- while (iterator.hasNext()) {
- String next = iterator.next();
- if (!dispatchIds.contains(next)) {
- iterator.remove();
+ // 查询当前用户所在的项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if (!CollectionUtils.isEmpty(projectTeamStaffs)) {
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
+ List<TProjectProposal> projectProposals = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .in(TProjectProposal::getTeamId, teamIds));
+ if (!CollectionUtils.isEmpty(projectProposals)) {
+ List<String> projectIds = projectProposals.stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches = experimentDispatchService.list(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .in(TExperimentDispatch::getProposalId, projectIds));
+ if (!CollectionUtils.isEmpty(experimentDispatches)) {
+ List<String> dispatchIds2 = experimentDispatches.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ // 查询检验报告
+ List<TInspectionReport> inspectionReports = inspectionReportService.list(Wrappers.lambdaQuery(TInspectionReport.class)
+ .eq(TInspectionReport::getStatus, 2)
+ .in(TInspectionReport::getDispatchId, dispatchIds2));
+ if (!CollectionUtils.isEmpty(inspectionReports)) {
+ List<String> dispatchIds = inspectionReports.stream().map(TInspectionReport::getDispatchId).distinct().collect(Collectors.toList());
+ List<String> dispatchIds1 = query.getDispatchIds();
+ Iterator<String> iterator = dispatchIds1.iterator();
+ while (iterator.hasNext()) {
+ String next = iterator.next();
+ if (dispatchIds.contains(next)) {
+ iterator.remove();
+ }
+ }
+ // if(CollectionUtils.isEmpty(dispatchIds1)){
+ // List<String> id = new ArrayList<>();
+ // id.add("-1");
+ // query.setDispatchIds(id);
+ // }else {
+ query.setDispatchIds(dispatchIds1);
+ // }
+ }
}
- }
- if(CollectionUtils.isEmpty(dispatchIds1)){
- List<String> id = new ArrayList<>();
- id.add("-1");
- query.setDispatchIds(id);
- }else {
- query.setDispatchIds(dispatchIds1);
}
}
}
--
Gitblit v1.7.1