From 6ae35089a05b58dc31c243b9bb4f6a80b20c3a7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 17:44:42 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentResultReportVO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentResultReportVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentResultReportVO.java
index 8e342d8..237ec3f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentResultReportVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentResultReportVO.java
@@ -1,9 +1,6 @@
package com.ruoyi.system.vo;
-import com.ruoyi.system.model.TExperimentResultReport;
-import com.ruoyi.system.model.TExperimentScheme;
-import com.ruoyi.system.model.TInspectionReport;
-import com.ruoyi.system.model.TResultWorkEvaluate;
+import com.ruoyi.system.model.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,10 +14,13 @@
@ApiModelProperty(value = "评分列表")
private List<TResultWorkEvaluate> resultWorkEvaluates;
@ApiModelProperty(value = "实验结果")
- private List<TExperimentScheme> experimentSchemes;
+ private List<TExperimentSchemeVO> experimentSchemeVOS;
@ApiModelProperty(value = "检验结果报告")
private List<TInspectionReport> InspectionReports;
-
+ @ApiModelProperty(value = "实验参与人员")
+ private List<TExperimentDispatchParticipants> experimentDispatchParticipants;
+ @ApiModelProperty(value = "实验调度")
+ private TExperimentDispatchVO experimentDispatchVO;
@ApiModelProperty(value = "项目课题方案")
private String projectName;
@@ -36,12 +36,12 @@
@ApiModelProperty(value = "化验师名称")
private String laboratoryChemistName;
- @ApiModelProperty(value = "化验师是否评定")
+ @ApiModelProperty(value = "化验师是否评定 1=是 0=否")
private Integer laboratoryChemistEvaluate;
@ApiModelProperty(value = "实验员姓名")
private String experimenterName;
- @ApiModelProperty(value = "实验员是否评定")
+ @ApiModelProperty(value = "实验员是否评定 1=是 0=否")
private Integer experimenterEvaluate;
}
--
Gitblit v1.7.1