From 30521c18a4c09ca3ff03b8216a243adc745ccf3c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 三月 2026 19:05:34 +0800
Subject: [PATCH] 超级管理员权限修改，工作评定统计
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java | 179 ++++++++++++++++++++---------------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClinicalTrialPointsServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentResultReportServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 17 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentSchemeServiceImpl.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TQaTestItemReportQuery.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectApprovalReportServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TClinicalTrialPointsController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectApprovalReportQuery.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TClinicalTrialPointsQuery.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TTesterOtherTaskQuery.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectProposalServiceImpl.java | 7
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentDispatchServiceImpl.java | 6
28 files changed, 161 insertions(+), 98 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TClinicalTrialPointsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TClinicalTrialPointsController.java
index 34227d8..e8a8d79 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TClinicalTrialPointsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TClinicalTrialPointsController.java
@@ -66,6 +66,7 @@
TClinicalTrialPointsQuery query = JSON.parseObject(param, TClinicalTrialPointsQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
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 2e8e606..95c2403 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
@@ -186,6 +186,14 @@
}
resultWorkEvaluateService.saveOrUpdateBatch(resultWorkEvaluates);
+ // 查询实验调度
+ TExperimentDispatch dispatch = experimentDispatchService.getById(dto.getDispatchId());
+ if(Objects.nonNull(dispatch)){
+ // 修改结束时间
+ dispatch.setExperimentEndTime(LocalDateTime.now());
+ experimentDispatchService.updateById(dispatch);
+ }
+
// 查询项目组
TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
// MESSAGE 添加消息
@@ -217,6 +225,15 @@
Long userId = tokenService.getLoginUser().getUserId();
TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId));
+
+ // 查询实验调度
+ TExperimentDispatch dispatch = experimentDispatchService.getById(dto.getDispatchId());
+ if(Objects.nonNull(dispatch)){
+ // 修改结束时间
+ dispatch.setExperimentEndTime(LocalDateTime.now());
+ experimentDispatchService.updateById(dispatch);
+ }
+
// 查询项目组
TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
if(dto.getStatus() != -1){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java
index bb7e026..94f01e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java
@@ -75,6 +75,7 @@
TFeasibilityStudyReportQuery query = JSON.parseObject(param, TFeasibilityStudyReportQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
index cd6d460..2da67ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
@@ -74,6 +74,7 @@
TProjectApprovalReportQuery query = JSON.parseObject(param, TProjectApprovalReportQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
index 19f0ed7..a6968b5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
@@ -82,6 +82,7 @@
TQaProduceReportQuery query = JSON.parseObject(param, TQaProduceReportQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
index e1da7e7..5763010 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
@@ -73,6 +73,7 @@
TQaTestItemReportQuery query = JSON.parseObject(param, TQaTestItemReportQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
index 0817e33..a5a1d7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
@@ -27,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -144,6 +145,13 @@
public R<Boolean> add(@RequestBody String param) {
TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class);
tResultWorkEvaluateService.save(dto);
+ // 查询实验调度
+ TExperimentDispatch dispatch = experimentDispatchService.getById(dto.getDispatchId());
+ if(Objects.nonNull(dispatch)){
+ // 修改结束时间
+ dispatch.setExperimentEndTime(LocalDateTime.now());
+ experimentDispatchService.updateById(dispatch);
+ }
return R.ok();
}
@@ -157,6 +165,13 @@
public R<Boolean> edit(@RequestBody String param) {
TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class);
tResultWorkEvaluateService.updateById(dto);
+ // 查询实验调度
+ TExperimentDispatch dispatch = experimentDispatchService.getById(dto.getDispatchId());
+ if(Objects.nonNull(dispatch)){
+ // 修改结束时间
+ dispatch.setExperimentEndTime(LocalDateTime.now());
+ experimentDispatchService.updateById(dispatch);
+ }
return R.ok();
}
@@ -598,26 +613,26 @@
if (collect5.isEmpty()) {
collect5.add("0");
}
- List<String> collect6 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect5)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches1 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect5)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect6 = experimentDispatches1.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect6.isEmpty()) {
collect6.add("0");
}
- List<TResultWorkEvaluate> list1 = tResultWorkEvaluateService.lambdaQuery().in(TResultWorkEvaluate::getDispatchId, collect6).list();
+ List<TResultWorkEvaluate> list1 = tResultWorkEvaluateService.lambdaQuery()
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 1)
+ .in(TResultWorkEvaluate::getDispatchId, collect6).list();
int tempDetail2 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list1) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
switch (evaluateOne) {
case 1:
-
tempDetail2 += 2;
break;
case 2:
tempDetail2 += 1;
-
break;
-
}
Integer evaluateTwo = tResultWorkEvaluate.getEvaluateTwo();
switch (evaluateTwo) {
@@ -626,14 +641,12 @@
break;
case 2:
tempDetail2 += 1;
-
break;
}
Integer evaluateThree = tResultWorkEvaluate.getEvaluateThree();
switch (evaluateThree) {
case 1:
tempDetail2 += 2;
-
break;
case 2:
tempDetail2 += 1;
@@ -643,7 +656,6 @@
switch (evaluateFour) {
case 1:
tempDetail2 += 2;
-
break;
case 2:
tempDetail2 += 1;
@@ -653,7 +665,6 @@
switch (evaluateFive) {
case 1:
tempDetail2 += 2;
-
break;
case 2:
tempDetail2 += 1;
@@ -672,7 +683,7 @@
tResultWorkEvaluateDetailEngineerVO2.setEndTime(list1.get(list1.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO2.setCount(list1.size());
+ tResultWorkEvaluateDetailEngineerVO2.setCount(experimentDispatches1.size());
tResultWorkEvaluateDetailEngineerVO2.setIntegral(tempDetail2);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO2);
@@ -683,14 +694,17 @@
if (collect7.isEmpty()) {
collect7.add("0");
}
- List<String> collect8 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect7)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches2 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect7)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect8 = experimentDispatches2.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect8.isEmpty()) {
collect8.add("0");
}
- List<TResultWorkEvaluate> list3 = tResultWorkEvaluateService.lambdaQuery().in(TResultWorkEvaluate::getDispatchId, collect8).list();
+ List<TResultWorkEvaluate> list3 = tResultWorkEvaluateService.lambdaQuery()
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 1)
+ .in(TResultWorkEvaluate::getDispatchId, collect8).list();
int tempDetail3 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list3) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
@@ -756,23 +770,26 @@
tResultWorkEvaluateDetailEngineerVO3.setStartTime(list3.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO3.setEndTime(list3.get(list3.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO3.setCount(list3.size());
+ tResultWorkEvaluateDetailEngineerVO3.setCount(experimentDispatches2.size());
tResultWorkEvaluateDetailEngineerVO3.setIntegral(tempDetail3);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO3);
// 验证试验阶段
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO4 = new TResultWorkEvaluateDetailEngineerVO();
- List<String> collect10 = list2.stream().filter(e -> e.getProjectStage().equals(2)).map(TProjectProposal::getId).collect(Collectors.toList());
+ List<String> collect10 = list2.stream().filter(e -> e.getProjectStage().equals(3)).map(TProjectProposal::getId).collect(Collectors.toList());
if (collect10.isEmpty()) {
collect10.add("0");
}
- List<String> collect11 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect10)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches3 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect10)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect11 = experimentDispatches3.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect11.isEmpty()) {
collect11.add("0");
}
- List<TResultWorkEvaluate> list4 = tResultWorkEvaluateService.lambdaQuery().in(TResultWorkEvaluate::getDispatchId, collect11).list();
+ List<TResultWorkEvaluate> list4 = tResultWorkEvaluateService.lambdaQuery()
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 1)
+ .in(TResultWorkEvaluate::getDispatchId, collect11).list();
int tempDetail4 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list4) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
@@ -838,7 +855,7 @@
tResultWorkEvaluateDetailEngineerVO4.setStartTime(list4.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO4.setEndTime(list4.get(list4.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO4.setCount(list4.size());
+ tResultWorkEvaluateDetailEngineerVO4.setCount(experimentDispatches3.size());
tResultWorkEvaluateDetailEngineerVO4.setIntegral(tempDetail4);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
// 工艺开发工具
@@ -861,7 +878,7 @@
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO5);
// 验证与发布
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO6 = new TResultWorkEvaluateDetailEngineerVO();
- List<TFeasibilityStudyReport> collect13 = total.stream().filter(e -> e.getReportType().equals(3)).collect(Collectors.toList());
+ List<TFeasibilityStudyReport> collect13 = total.stream().filter(e -> e.getReportType().equals(4)).collect(Collectors.toList());
int tempDetail16 = 0;
for (TFeasibilityStudyReport tFeasibilityStudyReport : collect13) {
if (StringUtils.hasLength(tFeasibilityStudyReport.getEvaluateScore())) {
@@ -895,8 +912,8 @@
if (!list6.isEmpty()) {
tResultWorkEvaluateDetailEngineerVO8.setStartTime(list6.get(0).getCreateTime());
tResultWorkEvaluateDetailEngineerVO8.setEndTime(list6.get(list6.size() - 1).getCreateTime());
+ tResultWorkEvaluateDetailEngineerVO8.setIntegral(list6.get(0).getEvaluateScore());
}
- tResultWorkEvaluateDetailEngineerVO8.setIntegral(list6.get(0).getEvaluateScore());
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO8);
tResultWorkEvaluateDetailVO.setEngineerList(tResultWorkEvaluateDetailEngineerVOS);
return R.ok(tResultWorkEvaluateDetailVO);
@@ -928,11 +945,11 @@
}
- List<TFeasibilityStudyReport> total = feasibilityStudyReportService.lambdaQuery()
- .eq(TFeasibilityStudyReport::getStatus, 3)
- .eq(TFeasibilityStudyReport::getTeamId, resultWorkEvaluate.getTeamId()).list();
- List<TResultWorkEvaluateDetailEngineerVO> tResultWorkEvaluateDetailEngineerVOS = new ArrayList<>();
+// List<TFeasibilityStudyReport> total = feasibilityStudyReportService.lambdaQuery()
+// .eq(TFeasibilityStudyReport::getStatus, 3)
+// .eq(TFeasibilityStudyReport::getTeamId, resultWorkEvaluate.getTeamId()).list();
for (SysUser sysUser : user5) {
+ List<TResultWorkEvaluateDetailEngineerVO> tResultWorkEvaluateDetailEngineerVOS = new ArrayList<>();
TResultWorkEvaluateDetailUserVO tResultWorkEvaluateDetailUserVO = new TResultWorkEvaluateDetailUserVO();
tResultWorkEvaluateDetailUserVO.setUserName(sysUser.getNickName());
// 开发阶段
@@ -942,7 +959,7 @@
.eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
.eq(TResultWorkEvaluate::getTeamId, resultWorkEvaluate.getTeamId()).list();
// 调度ids
- List<String> collect = list1.stream().map(TResultWorkEvaluate::getDispatchId).collect(Collectors.toList());
+ List<String> collect = list1.stream().map(TResultWorkEvaluate::getDispatchId).distinct().collect(Collectors.toList());
if (collect.isEmpty()) {
collect.add("0");
}
@@ -954,20 +971,22 @@
status.add(4);
status.add(5);
// 课题方案ids
- List<String> collect6 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getId, collect)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getProposalId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches1 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getId, collect)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect6 = experimentDispatches1.stream().map(TExperimentDispatch::getProposalId).distinct().collect(Collectors.toList());
if (collect6.isEmpty()) {
collect6.add("0");
}
List<TProjectProposal> list2 = projectProposalService.lambdaQuery().in(TProjectProposal::getId, collect6)
- .notIn(TProjectProposal::getAuditStatus, status).list();
- List<String> collect5 = list2.stream().filter(e -> e.getProjectStage().equals(1)).map(TProjectProposal::getId).collect(Collectors.toList());
+ .notIn(TProjectProposal::getAuditStatus, status)
+ .list();
+ List<String> collect5 = list2.stream().filter(e -> e.getProjectStage().equals(1)).map(TProjectProposal::getId).distinct().collect(Collectors.toList());
if (collect5.isEmpty()) {
collect5.add("0");
}
// 开发阶段调度ids
- List<String> collect1 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect5).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<String> collect1 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect5)
+ .list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect1.isEmpty()) {
collect1.add("0");
}
@@ -1033,31 +1052,32 @@
break;
}
}
- if (!list1.isEmpty()) {
- tResultWorkEvaluateDetailEngineerVO2.setEndTime(list1.get(list1.size() - 1).getEvaluateTime());
- tResultWorkEvaluateDetailEngineerVO2.setStartTime(list1.get(0).getEvaluateTime());
+ if (!collect2.isEmpty()) {
+ tResultWorkEvaluateDetailEngineerVO2.setEndTime(collect2.get(collect2.size() - 1).getEvaluateTime());
+ tResultWorkEvaluateDetailEngineerVO2.setStartTime(collect2.get(0).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO2.setCount(collect5.size());
+ tResultWorkEvaluateDetailEngineerVO2.setCount(experimentDispatches1.size());
tResultWorkEvaluateDetailEngineerVO2.setIntegral(tempDetail2);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO2);
// 中试试验阶段
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO3 = new TResultWorkEvaluateDetailEngineerVO();
- List<String> collect7 = projectProposalService.lambdaQuery().in(TProjectProposal::getId, collect6)
- .eq(TProjectProposal::getProjectStage, 2)
- .notIn(TProjectProposal::getAuditStatus, status).list().stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ List<String> collect7 = list2.stream().filter(e -> e.getProjectStage().equals(2)).map(TProjectProposal::getId).collect(Collectors.toList());
if (collect7.isEmpty()) {
collect7.add("0");
}
- List<String> collect8 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect7)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches2 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect7)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect8 = experimentDispatches2.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect8.isEmpty()) {
collect8.add("0");
}
List<TResultWorkEvaluate> list3 = tResultWorkEvaluateService.lambdaQuery()
- .eq(TResultWorkEvaluate::getStatus, 1).in(TResultWorkEvaluate::getDispatchId, collect8).list();
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 2)
+ .eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
+ .in(TResultWorkEvaluate::getDispatchId, collect8).list();
int tempDetail3 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list3) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
@@ -1123,25 +1143,27 @@
tResultWorkEvaluateDetailEngineerVO3.setStartTime(list3.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO3.setEndTime(list3.get(list3.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO3.setCount(list3.size());
+ tResultWorkEvaluateDetailEngineerVO3.setCount(experimentDispatches2.size());
tResultWorkEvaluateDetailEngineerVO3.setIntegral(tempDetail3);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO3);
// 验证试验阶段
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO4 = new TResultWorkEvaluateDetailEngineerVO();
- List<String> collect10 = projectProposalService.lambdaQuery().in(TProjectProposal::getId, collect6)
- .eq(TProjectProposal::getProjectStage, 2)
- .notIn(TProjectProposal::getAuditStatus, status).list().stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ List<String> collect10 = list2.stream().filter(e -> e.getProjectStage().equals(3)).map(TProjectProposal::getId).collect(Collectors.toList());
if (collect10.isEmpty()) {
collect10.add("0");
}
- List<String> collect11 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect10)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches3 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect10)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect11 = experimentDispatches3.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect11.isEmpty()) {
collect11.add("0");
}
- List<TResultWorkEvaluate> list4 = tResultWorkEvaluateService.lambdaQuery().in(TResultWorkEvaluate::getDispatchId, collect11).list();
+ List<TResultWorkEvaluate> list4 = tResultWorkEvaluateService.lambdaQuery()
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 2)
+ .eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
+ .in(TResultWorkEvaluate::getDispatchId, collect11).list();
int tempDetail4 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list4) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
@@ -1207,7 +1229,7 @@
tResultWorkEvaluateDetailEngineerVO4.setStartTime(list4.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO4.setEndTime(list4.get(list4.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO4.setCount(list4.size());
+ tResultWorkEvaluateDetailEngineerVO4.setCount(experimentDispatches3.size());
tResultWorkEvaluateDetailEngineerVO4.setIntegral(tempDetail4);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
// 项目检测项评定
@@ -1318,8 +1340,8 @@
}
}
- List<TResultWorkEvaluateDetailEngineerVO> tResultWorkEvaluateDetailEngineerVOS = new ArrayList<>();
for (SysUser sysUser : user5) {
+ List<TResultWorkEvaluateDetailEngineerVO> tResultWorkEvaluateDetailEngineerVOS = new ArrayList<>();
TResultWorkEvaluateDetailUserVO tResultWorkEvaluateDetailUserVO = new TResultWorkEvaluateDetailUserVO();
tResultWorkEvaluateDetailUserVO.setUserName(sysUser.getNickName());
// 开发阶段
@@ -1341,9 +1363,9 @@
status.add(4);
status.add(5);
// 课题方案ids
- List<String> collect6 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getId, collect)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getProposalId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches1 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getId, collect)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect6 = experimentDispatches1.stream().map(TExperimentDispatch::getProposalId).collect(Collectors.toList());
if (collect6.isEmpty()) {
collect6.add("0");
}
@@ -1425,26 +1447,27 @@
tResultWorkEvaluateDetailEngineerVO2.setEndTime(list1.get(list1.size() - 1).getEvaluateTime());
}
tResultWorkEvaluateDetailEngineerVO2.setStartTime(projectTeam.getCreateTime());
- tResultWorkEvaluateDetailEngineerVO2.setCount(collect5.size());
+ tResultWorkEvaluateDetailEngineerVO2.setCount(experimentDispatches1.size());
tResultWorkEvaluateDetailEngineerVO2.setIntegral(tempDetail2);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO2);
// 中试试验阶段
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO3 = new TResultWorkEvaluateDetailEngineerVO();
- List<String> collect7 = projectProposalService.lambdaQuery().in(TProjectProposal::getId, collect6)
- .eq(TProjectProposal::getProjectStage, 2)
- .notIn(TProjectProposal::getAuditStatus, status).list().stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ List<String> collect7 = list2.stream().filter(e -> e.getProjectStage().equals(2)).map(TProjectProposal::getId).collect(Collectors.toList());
if (collect7.isEmpty()) {
collect7.add("0");
}
- List<String> collect8 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect7)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches2 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect7)
+ .notIn(TExperimentDispatch::getStatus, -1,2,3).list();
+ List<String> collect8 = experimentDispatches2.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect8.isEmpty()) {
collect8.add("0");
}
List<TResultWorkEvaluate> list3 = tResultWorkEvaluateService.lambdaQuery()
- .eq(TResultWorkEvaluate::getStatus, 1).in(TResultWorkEvaluate::getDispatchId, collect8).list();
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 3)
+ .eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
+ .in(TResultWorkEvaluate::getDispatchId, collect8).list();
int tempDetail3 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list3) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
@@ -1510,25 +1533,27 @@
tResultWorkEvaluateDetailEngineerVO3.setStartTime(list3.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO3.setEndTime(list3.get(list3.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO3.setCount(list3.size());
+ tResultWorkEvaluateDetailEngineerVO3.setCount(experimentDispatches2.size());
tResultWorkEvaluateDetailEngineerVO3.setIntegral(tempDetail3);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO3);
// 验证试验阶段
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO4 = new TResultWorkEvaluateDetailEngineerVO();
- List<String> collect10 = projectProposalService.lambdaQuery().in(TProjectProposal::getId, collect6)
- .eq(TProjectProposal::getProjectStage, 2)
- .notIn(TProjectProposal::getAuditStatus, status).list().stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ List<String> collect10 = list2.stream().filter(e -> e.getProjectStage().equals(2)).map(TProjectProposal::getId).collect(Collectors.toList());
if (collect10.isEmpty()) {
collect10.add("0");
}
- List<String> collect11 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect10)
- .ne(TExperimentDispatch::getStatus, -1)
- .ne(TExperimentDispatch::getStatus, 1).list().stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TExperimentDispatch> experimentDispatches3 = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, collect10)
+ .notIn(TExperimentDispatch::getStatus, -1,1,3).list();
+ List<String> collect11 = experimentDispatches3.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
if (collect11.isEmpty()) {
collect11.add("0");
}
- List<TResultWorkEvaluate> list4 = tResultWorkEvaluateService.lambdaQuery().in(TResultWorkEvaluate::getDispatchId, collect11).list();
+ List<TResultWorkEvaluate> list4 = tResultWorkEvaluateService.lambdaQuery()
+ .eq(TResultWorkEvaluate::getStatus, 1)
+ .eq(TResultWorkEvaluate::getEvaluateType, 3)
+ .eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
+ .in(TResultWorkEvaluate::getDispatchId, collect11).list();
int tempDetail4 = 0;
for (TResultWorkEvaluate tResultWorkEvaluate : list4) {
Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
@@ -1594,7 +1619,7 @@
tResultWorkEvaluateDetailEngineerVO4.setStartTime(list4.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO4.setEndTime(list4.get(list4.size() - 1).getEvaluateTime());
}
- tResultWorkEvaluateDetailEngineerVO4.setCount(list4.size());
+ tResultWorkEvaluateDetailEngineerVO4.setCount(experimentDispatches3.size());
tResultWorkEvaluateDetailEngineerVO4.setIntegral(tempDetail4);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
// 其他任务
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
index e35b2ba..73288d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
@@ -67,6 +67,7 @@
TTesterOtherTaskQuery query = JSON.parseObject(param, TTesterOtherTaskQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TClinicalTrialPointsQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TClinicalTrialPointsQuery.java
index 82f925d..f31bff5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TClinicalTrialPointsQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TClinicalTrialPointsQuery.java
@@ -17,4 +17,7 @@
private String trialContent;
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
+
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java
index 950f53c..583ada0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java
@@ -32,4 +32,7 @@
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Integer roleType;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectApprovalReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectApprovalReportQuery.java
index 7b3f9ea..1789637 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectApprovalReportQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectApprovalReportQuery.java
@@ -24,4 +24,7 @@
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
+
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java
index c53f387..1513a43 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java
@@ -29,4 +29,6 @@
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaTestItemReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaTestItemReportQuery.java
index ab17af9..a42afb9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaTestItemReportQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaTestItemReportQuery.java
@@ -28,5 +28,6 @@
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
-
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TTesterOtherTaskQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTesterOtherTaskQuery.java
index b1c054d..d398a82 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TTesterOtherTaskQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTesterOtherTaskQuery.java
@@ -18,4 +18,8 @@
private String taskContent;
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
+
+
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClinicalTrialPointsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClinicalTrialPointsServiceImpl.java
index 7851691..fc00ed6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClinicalTrialPointsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClinicalTrialPointsServiceImpl.java
@@ -28,7 +28,7 @@
@Override
public PageInfo<TClinicalTrialPointsVO> pageList(TClinicalTrialPointsQuery query) {
PageInfo<TClinicalTrialPointsVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
+ if(CollectionUtils.isEmpty(query.getTeamIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TClinicalTrialPointsVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentDispatchServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentDispatchServiceImpl.java
index e8f290f..f9c207b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentDispatchServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentDispatchServiceImpl.java
@@ -43,9 +43,9 @@
@Override
public PageInfo<TExperimentDispatchVO> pageList(TExperimentDispatchQuery query) {
PageInfo<TExperimentDispatchVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
- return pageInfo;
- }
+// if(CollectionUtils.isEmpty(query.getDispatchIds())){
+// return pageInfo;
+// }
// 查询自己已通过的实验调度
if(Objects.nonNull(query.getOtherStatus())){
List<TExperimentDispatchParticipants> experimentDispatchParticipants1 = experimentDispatchParticipantsMapper.selectList(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentResultReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentResultReportServiceImpl.java
index 35b7b8e..6224aef 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentResultReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentResultReportServiceImpl.java
@@ -44,7 +44,7 @@
@Override
public PageInfo<TExperimentResultReportVO> pageList(TExperimentResultReportQuery query) {
PageInfo<TExperimentResultReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TExperimentResultReportVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentSchemeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentSchemeServiceImpl.java
index 6f3066e..e0f2054 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentSchemeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentSchemeServiceImpl.java
@@ -39,7 +39,7 @@
@Override
public PageInfo<TExperimentSchemeVO> pageList(TExperimentSchemeQuery query) {
PageInfo<TExperimentSchemeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TExperimentSchemeVO> list = this.baseMapper.pageList(query,pageInfo);
@@ -66,7 +66,7 @@
@Override
public PageInfo<TExperimentSchemeVO> auditPageList(TExperimentSchemeQuery query) {
PageInfo<TExperimentSchemeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TExperimentSchemeVO> list = this.baseMapper.auditPageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java
index 0f62d12..74c9af4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java
@@ -38,7 +38,7 @@
@Override
public PageInfo<TFeasibilityStudyReportVO> pageList(TFeasibilityStudyReportQuery query) {
PageInfo<TFeasibilityStudyReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
+ if(CollectionUtils.isEmpty(query.getTeamIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TFeasibilityStudyReportVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java
index 725df2e..ac65853 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java
@@ -26,7 +26,7 @@
@Override
public PageInfo<TInspectionReportVO> pageList(TInspectionReportQuery query) {
PageInfo<TInspectionReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TInspectionReportVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectApprovalReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectApprovalReportServiceImpl.java
index ed928e4..293969a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectApprovalReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectApprovalReportServiceImpl.java
@@ -26,7 +26,7 @@
@Override
public PageInfo<TProjectApprovalReportVO> pageList(TProjectApprovalReportQuery query) {
PageInfo<TProjectApprovalReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
+ if(CollectionUtils.isEmpty(query.getTeamIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TProjectApprovalReportVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectProposalServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectProposalServiceImpl.java
index b3c619e..9302f77 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectProposalServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectProposalServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.system.service.TProjectProposalService;
import com.ruoyi.system.vo.TProjectProposalVO;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import java.util.List;
@@ -26,9 +25,9 @@
@Override
public PageInfo<TProjectProposalVO> pageList(TProjectProposalQuery query) {
PageInfo<TProjectProposalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
- return pageInfo;
- }
+// if(CollectionUtils.isEmpty(query.getTeamIds())){
+// return pageInfo;
+// }
List<TProjectProposalVO> list = this.baseMapper.pageList(query,pageInfo);
pageInfo.setRecords(list);
return pageInfo;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java
index 1f8a4ce..218a0b6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java
@@ -35,7 +35,7 @@
@Override
public PageInfo<TQaProduceReportVO> pageList(TQaProduceReportQuery query) {
PageInfo<TQaProduceReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
+ if(CollectionUtils.isEmpty(query.getTeamIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TQaProduceReportVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java
index a208c04..c9bcc4e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java
@@ -52,7 +52,7 @@
@Override
public PageInfo<TQaTestItemReportVO> pageList(TQaTestItemReportQuery query) {
PageInfo<TQaTestItemReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
+ if(CollectionUtils.isEmpty(query.getTeamIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TQaTestItemReportVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
index 94f940a..cd0e245 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
@@ -44,7 +44,7 @@
public PageInfo<TSamplingRecordVO> pageList(TSamplingRecordQuery query) {
List<TSamplingRecordVO> res = new ArrayList<>();
PageInfo<TSamplingRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TSamplingRecordVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
index 652cc57..a458add 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
@@ -41,7 +41,7 @@
@Override
public PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query) {
PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TTestMethodConfirmSheetOriginalVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java
index 8647563..ed62d53 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java
@@ -26,7 +26,7 @@
@Override
public PageInfo<TTestMethodConfirmSheetVO> pageList(TTestMethodConfirmSheetQuery query) {
PageInfo<TTestMethodConfirmSheetVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getDispatchIds())){
+ if(CollectionUtils.isEmpty(query.getDispatchIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TTestMethodConfirmSheetVO> list = this.baseMapper.pageList(query,pageInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java
index cf1bb85..36a3c17 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java
@@ -27,7 +27,7 @@
@Override
public PageInfo<TTesterOtherTaskVO> pageList(TTesterOtherTaskQuery query) {
PageInfo<TTesterOtherTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- if(CollectionUtils.isEmpty(query.getTeamIds())){
+ if(CollectionUtils.isEmpty(query.getTeamIds()) && query.getRoleType() != 1){
return pageInfo;
}
List<TTesterOtherTaskVO> list = this.baseMapper.pageList(query,pageInfo);
--
Gitblit v1.7.1