From 6f10b63b234bc7b562afdbf954e6b762d8568581 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 16:44:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml | 3
ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java | 52 +++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java | 4 -
ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml | 9 +
ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentResultReportQuery.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentSchemeQuery.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 1
ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml | 3
ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetQuery.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 130 +++++++++++++++++++++++++++++++-
ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 1
ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml | 3
22 files changed, 219 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
index 029e2ab..97b6b14 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
@@ -78,6 +78,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
if(roleType ==2){
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 1949409..ccfb8e4 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
@@ -82,6 +82,7 @@
TExperimentResultReportQuery query = JSON.parseObject(param, TExperimentResultReportQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
if(roleType ==2){
// 查询项目组
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
index 65cff20..5fed8d8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
@@ -81,6 +81,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
if(roleType ==2){
@@ -122,6 +123,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
// 查询实验参与人员
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
index c5df5ba..294fb19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
@@ -71,6 +71,7 @@
// 获取当前登录人
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/TProjectTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
index 0688c45..65b1130 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -12,17 +12,15 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TProjectTeamDTO;
import com.ruoyi.system.dto.UpAndDownDTO;
-import com.ruoyi.system.model.TProjectTeam;
-import com.ruoyi.system.model.TProjectTeamStaff;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TProjectTeamQuery;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TProjectTeamVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -46,12 +44,38 @@
private final TProjectTeamStaffService projectTeamStaffService;
private final ISysUserService sysUserService;
private final TokenService tokenService;
+ private final TProjectProposalService projectProposalService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TTestMethodConfirmSheetService testMethodConfirmSheetService;
+ private final TExperimentSchemeService experimentSchemeService;
+ private final TSamplingRecordService samplingRecordService;
+ private final TExperimentResultReportService experimentResultReportService;
+ private final TQaTestItemService qaTestItemService;
+ private final TQaProduceReportService qaProduceReportService;
+ private final TFeasibilityStudyReportService feasibilityStudyReportService;
+ private final TInspectionReportService inspectionReportService;
+ private final TProjectApprovalReportService projectApprovalReportService;
+ private final TTesterOtherTaskService testerOtherTaskService;
+ private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
@Autowired
- public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService) {
+ public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService, TProjectProposalService projectProposalService, TExperimentDispatchService experimentDispatchService, TTestMethodConfirmSheetService testMethodConfirmSheetService, TExperimentSchemeService experimentSchemeService, TSamplingRecordService samplingRecordService, TExperimentResultReportService experimentResultReportService, TQaTestItemService qaTestItemService, TQaProduceReportService qaProduceReportService, TFeasibilityStudyReportService feasibilityStudyReportService, TInspectionReportService inspectionReportService, TProjectApprovalReportService projectApprovalReportService, TTesterOtherTaskService testerOtherTaskService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService) {
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
this.sysUserService = sysUserService;
this.tokenService = tokenService;
+ this.projectProposalService = projectProposalService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.testMethodConfirmSheetService = testMethodConfirmSheetService;
+ this.experimentSchemeService = experimentSchemeService;
+ this.samplingRecordService = samplingRecordService;
+ this.experimentResultReportService = experimentResultReportService;
+ this.qaTestItemService = qaTestItemService;
+ this.qaProduceReportService = qaProduceReportService;
+ this.feasibilityStudyReportService = feasibilityStudyReportService;
+ this.inspectionReportService = inspectionReportService;
+ this.projectApprovalReportService = projectApprovalReportService;
+ this.testerOtherTaskService = testerOtherTaskService;
+ this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
}
/**
@@ -198,6 +222,100 @@
TProjectTeam projectTeam = projectTeamService.getById(dto.getId());
projectTeam.setStatus(dto.getStatus());
projectTeamService.updateById(projectTeam);
+
+ // 封存项目课题方案
+ List<TProjectProposal> projectProposals = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .eq(TProjectProposal::getTeamId, dto.getId()));
+ if(!CollectionUtils.isEmpty(projectProposals)){
+ for (TProjectProposal projectProposal : projectProposals) {
+ projectProposal.setAuditStatus(5);
+ }
+ projectProposalService.updateBatchById(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)){
+ experimentDispatches.forEach(experimentDispatch -> {
+ experimentDispatch.setStatus(3);
+ });
+ experimentDispatchService.updateBatchById(experimentDispatches);
+
+ // 封存检验方法
+ List<String> dispatchIds = experimentDispatches.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TTestMethodConfirmSheet> testMethodConfirmSheets = testMethodConfirmSheetService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheet.class)
+ .in(TTestMethodConfirmSheet::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(testMethodConfirmSheets)){
+ testMethodConfirmSheets.forEach(testMethodConfirmSheet -> {
+ testMethodConfirmSheet.setAuditStatus(5);
+ });
+ testMethodConfirmSheetService.updateBatchById(testMethodConfirmSheets);
+ }
+
+ // 封存试验方案
+ List<TExperimentScheme> experimentSchemes = experimentSchemeService.list(Wrappers.lambdaQuery(TExperimentScheme.class)
+ .in(TExperimentScheme::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentSchemes)){
+ experimentSchemes.forEach(experimentScheme -> {
+ experimentScheme.setStatus(5);
+ });
+ experimentSchemeService.updateBatchById(experimentSchemes);
+ }
+
+ // 封存取样记录
+ List<TSamplingRecord> samplingRecords = samplingRecordService.list(Wrappers.lambdaQuery(TSamplingRecord.class)
+ .in(TSamplingRecord::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(samplingRecords)){
+ samplingRecords.forEach(samplingRecord -> {
+ samplingRecord.setStatus(3);
+ });
+ samplingRecordService.updateBatchById(samplingRecords);
+ }
+
+ // 封存结果汇报
+ List<TExperimentResultReport> experimentResultReports = experimentResultReportService.list(Wrappers.lambdaQuery(TExperimentResultReport.class)
+ .in(TExperimentResultReport::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentResultReports)){
+ experimentResultReports.forEach(experimentResultReport -> {
+ experimentResultReport.setStatus(4);
+ });
+ experimentResultReportService.updateBatchById(experimentResultReports);
+ }
+
+ }
+ }
+
+ // 封存检测项
+// List<TQaTestItem> qaTestItems = qaTestItemService.list(Wrappers.lambdaQuery(TQaTestItem.class)
+// .eq(TQaTestItem::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(qaTestItems)){
+// qaTestItems.forEach(qaTestItem -> {
+// qaTestItem.setStatus(4);
+// });
+// qaTestItemService.updateBatchById(qaTestItems);
+// }
+
+ // 封存中试
+// List<TQaProduceReport> qaProduceReports = qaProduceReportService.list(Wrappers.lambdaQuery(TQaProduceReport.class)
+// .eq(TQaProduceReport::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(qaProduceReports)){
+// qaProduceReports.forEach(qaProduceReport -> {
+// qaProduceReport.setStatus(4);
+// });
+// qaProduceReportService.updateBatchById(qaProduceReports);
+// }
+
+ // 封存可行等报告
+// List<TFeasibilityStudyReport> feasibilityStudyReports = feasibilityStudyReportService.list(Wrappers.lambdaQuery(TFeasibilityStudyReport.class)
+// .eq(TFeasibilityStudyReport::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(feasibilityStudyReports)){
+// feasibilityStudyReports.forEach(feasibilityStudyReport -> {
+// feasibilityStudyReport.setStatus(4);
+// });
+// feasibilityStudyReportService.updateBatchById(feasibilityStudyReports);
+// }
+
+
return R.ok();
}
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 2f888d1..61a872d 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TResultWorkEvaluateDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.ResultEvaluateChemistTesterQuery;
import com.ruoyi.system.query.TProjectApprovalReportQuery;
@@ -20,6 +21,7 @@
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -70,6 +73,8 @@
private TProjectTeamStaffService projectTeamStaffService;
@Autowired
private ISysUserService sysUserService;
+ @Autowired
+ private SysUserMapper sysUserMapper;
@Autowired
private TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
@@ -157,6 +162,53 @@
return R.ok();
}
+ /**
+ * 查看实验结果工作评定管理详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:detail')")
+ @ApiOperation(value = "查看实验结果工作评定管理详情")
+ @GetMapping(value = "/open/t-result-work-evaluate/getEvaluateDetailById")
+ public R<TResultWorkEvaluateVO> getEvaluateDetailById(@RequestParam String id) {
+
+ // 查询实验结果工作评定
+ TResultWorkEvaluate resultWorkEvaluate = tResultWorkEvaluateService.getById(id);
+
+ TResultWorkEvaluateVO tResultWorkEvaluateVO = new TResultWorkEvaluateVO();
+ BeanUtils.copyProperties(resultWorkEvaluate, tResultWorkEvaluateVO);
+
+ // 查询实验调度
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(resultWorkEvaluate.getDispatchId());
+
+ // 查询实验调度信息
+ if(Objects.nonNull(experimentDispatch)){
+ // 查询课题方案名称
+ TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ if(Objects.nonNull(projectProposal)){
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ experimentDispatch.setProjectCode(projectProposal.getProjectCode());
+ }
+ // 查询参与人员
+ List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId()));
+ List<Long> userIds1 = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
+ List<SysUser> sysUsers1 = sysUserMapper.selectUserByIds(userIds1);
+ String participantsName = sysUsers1.stream().map(SysUser::getNickName).collect(Collectors.joining(";"));
+ experimentDispatch.setParticipantsName(participantsName);
+ }
+ tResultWorkEvaluateVO.setExperimentDispatch(experimentDispatch);
+
+ // 查询被评定人
+ SysUser sysUser = sysUserService.selectUserById(tResultWorkEvaluateVO.getUserId());
+ if(tResultWorkEvaluateVO.getEvaluateType() == 2){
+ // 化验师
+ tResultWorkEvaluateVO.setChemistName(sysUser.getNickName());
+ }else {
+ // 实验员
+ tResultWorkEvaluateVO.setTesterName(sysUser.getNickName());
+ }
+
+ return R.ok(tResultWorkEvaluateVO);
+ }
/**
* 查询可评定的化验师
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index 3f9118f..472321a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -82,6 +82,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
if(roleType ==2){
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 e3a7333..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
@@ -82,6 +82,7 @@
// 获取当前用户
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if (roleType != 1){
query.setUserId(userId);
if(roleType ==2){
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 cc34412..7a77c60 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
@@ -120,10 +120,6 @@
}else {
query.setDispatchIds(dispatchIds1);
}
- }else {
- List<String> id = new ArrayList<>();
- id.add("-1");
- query.setDispatchIds(id);
}
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java
index 16f969f..70cb99e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java
@@ -35,4 +35,6 @@
@ApiModelProperty(value = "实验id 实验员和化验师使用 前端忽略")
private List<String> dispatchIdList;
+ private Integer roleType;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentResultReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentResultReportQuery.java
index 484e9ed..0610718 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentResultReportQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentResultReportQuery.java
@@ -25,5 +25,5 @@
@ApiModelProperty(value = "实验调度id集合 前端忽略")
private List<String> dispatchIds;
-
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentSchemeQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentSchemeQuery.java
index 5186214..1fd173d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentSchemeQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentSchemeQuery.java
@@ -25,4 +25,6 @@
@ApiModelProperty(value = "实验id 前端忽略")
private List<String> dispatchIds;
+
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java
index 8ccdf2f..7710ab4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java
@@ -21,6 +21,9 @@
private String createBy;
@ApiModelProperty(value = "审批状态 -1=草稿箱 1=审批中 2=已通过 3=已驳回 4=已撤销 5=已封存")
private Integer auditStatus;
+
@ApiModelProperty(value = "项目组id集合 前端忽略")
private List<String> teamIds;
+
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
index 7740a14..3f8bf6d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
@@ -34,4 +34,6 @@
@ApiModelProperty(value = "实验id 前端忽略")
private List<String> dispatchIds;
+ private Integer roleType;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetQuery.java
index 8305c7f..cb75f25 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetQuery.java
@@ -28,4 +28,6 @@
@ApiModelProperty(value = "实验id 前端忽略")
private List<String> dispatchIds;
+
+ private Integer roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java
index 4373fd8..99bf70f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.model.TExperimentDispatch;
import com.ruoyi.system.model.TResultWorkEvaluate;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -39,5 +40,7 @@
private String testerName;
@ApiModelProperty(value = "项目课题方案")
private String projectName;
+ @ApiModelProperty(value = "实验调度对象")
+ private TExperimentDispatch experimentDispatch;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
index 56289ce..7aa9ba6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
@@ -44,6 +44,9 @@
<if test="query.otherStatus !=null">
and ted.status = #{query.otherStatus}
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND ted.status != 3
+ </if>
<if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
and ted.id in
<foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml
index 0b20971..58ae63c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml
@@ -48,9 +48,6 @@
<if test="query.status != null">
and terr.status = #{query.status}
</if>
- <if test="query.status == null">
- and terr.status != -1
- </if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND terr.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
@@ -60,6 +57,12 @@
#{item}
</foreach>
</if>
+ <if test="query.status == null">
+ and terr.status != -1
+ </if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND terr.status != 4
+ </if>
AND terr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY terr.create_time DESC
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
index 1615c19..135dcc4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
@@ -61,6 +61,9 @@
#{item}
</foreach>
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tes.status != 5
+ </if>
<if test="query.status == null">
and tes.status != -1
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
index 2b3f64a..751a8a3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
@@ -59,6 +59,9 @@
<if test="query.auditStatus != null">
AND tpp.audit_status = #{query.auditStatus}
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tpp.audit_status != 5
+ </if>
<if test="query.teamIds != null and query.teamIds.size() > 0">
AND tpp.team_id IN
<foreach item="teamId" collection="query.teamIds" separator="," open="(" close=")" index="">
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
index b4fa15d..a8c9f87 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
@@ -53,6 +53,9 @@
#{item}
</foreach>
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tsr.status != 3
+ </if>
<if test="query.status == null">
and tsr.status != -1
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
index 56466c7..c090ee2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
@@ -44,6 +44,9 @@
<if test="query.auditStatus != null">
and tmcs.audit_status = #{query.auditStatus}
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tmcs.audit_status != 5
+ </if>
<if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
and tmcs.dispatch_id in
<foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
--
Gitblit v1.7.1