From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java | 82 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java
index c8acadf..32f3412 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java
@@ -2,7 +2,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentReportFileInfoDO;
import java.math.BigDecimal;
import java.util.Date;
@@ -10,9 +9,78 @@
public class AccidentReportDetailRespDTO {
- private Long id;
+ private List<AccidentExpressFileRespDTO> expressFileList;
- private Boolean status ;
+ public List<AccidentExpressFileRespDTO> getExpressFileList() {
+ return expressFileList;
+ }
+
+ public void setExpressFileList(List<AccidentExpressFileRespDTO> expressFileList) {
+ this.expressFileList = expressFileList;
+ }
+
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ private String fillInUserName;
+
+ public String getFillInUserName() {
+ return fillInUserName;
+ }
+
+ public void setFillInUserName(String fillInUserName) {
+ this.fillInUserName = fillInUserName;
+ }
+
+ private String accidentName;
+
+ private Long accidentDepartmentId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date occurrenceTime;
+
+ private String occurrencePlace;
+
+ public String getAccidentName() {
+ return accidentName;
+ }
+
+ public void setAccidentName(String accidentName) {
+ this.accidentName = accidentName;
+ }
+
+ public Long getAccidentDepartmentId() {
+ return accidentDepartmentId;
+ }
+
+ public void setAccidentDepartmentId(Long accidentDepartmentId) {
+ this.accidentDepartmentId = accidentDepartmentId;
+ }
+
+ public Date getOccurrenceTime() {
+ return occurrenceTime;
+ }
+
+ public void setOccurrenceTime(Date occurrenceTime) {
+ this.occurrenceTime = occurrenceTime;
+ }
+
+ public String getOccurrencePlace() {
+ return occurrencePlace;
+ }
+
+ public void setOccurrencePlace(String occurrencePlace) {
+ this.occurrencePlace = occurrencePlace;
+ }
+
+ private Long id;
private Long accidentExpressId;
@@ -55,14 +123,6 @@
private String otherMaterials;
private List<AccidentReportFileRespDTO> fileList;
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
- }
public Long getId() {
return id;
--
Gitblit v1.9.2