From 37b0d2560607d1e0bfd5247a59a154704cac60f8 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 07 十一月 2024 09:17:43 +0800
Subject: [PATCH] 修改暂存和详情暂时及列表数据处理
---
src/main/java/com/gkhy/labRiskManage/application/experiment/dto/dto/ExperimentInfoAppQueryDTO.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/application/experiment/dto/dto/ExperimentInfoAppQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/application/experiment/dto/dto/ExperimentInfoAppQueryDTO.java
index af88864..0fac529 100644
--- a/src/main/java/com/gkhy/labRiskManage/application/experiment/dto/dto/ExperimentInfoAppQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/application/experiment/dto/dto/ExperimentInfoAppQueryDTO.java
@@ -2,9 +2,15 @@
import com.gkhy.labRiskManage.api.controller.experiment.dto.resp.ExperimentAndEmergencyRespDTO;
+import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAndType;
import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
+import com.gkhy.labRiskManage.domain.experiment.model.dto.ExperimentAndTypeDTO;
import lombok.Data;
+import javax.persistence.CascadeType;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
import java.time.LocalDateTime;
import java.util.List;
@@ -30,6 +36,10 @@
* 实验类型:1-化学类；2-生物类；3-辐射类；4-机电类；5-特种设备类；6-其它类
*/
private Byte experimentType;
+ /**
+ * 实验类型名称
+ */
+ private String experimentTypeName;
/**
* 实验负责人id
*/
@@ -204,12 +214,25 @@
* 填报人
*/
private String assessPerson;
+ /**
+ * 暂存保存：1-保存；2-暂存
+ */
+ private Byte stagingTag;
+
+
+ private List<ExperimentAndTypeDTO> types;
+
+ private List<ExperimentAndSiteAppQueryDTO> sites;
+
+ private List<ExperimentAndDeviceAppQueryDTO> devices;
private List<ExperimentAndPersonAppQueryDTO> persons;
- private List<ExperimentAndDeviceAppQueryDTO> devices;
- private List<ExperimentAndStuffAppQueryDTO> stuffs;
+
private List<ExperimentHazardousWasteAppQueryDTO> wastes;
- private List<ExperimentAndSiteAppQueryDTO> sites;
+
+ private List<ExperimentAndStuffAppQueryDTO> stuffs;
+
+
/**
* 演练情况
*/
--
Gitblit v1.9.2