From 1341b18605bcb800eba683eda18640520a6508a5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 15 Sep 2022 15:38:05 +0800
Subject: [PATCH] 事故数据字典fix

---
 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java |  100 ++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 80 insertions(+), 20 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..aa6d64d 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,15 +9,84 @@
 
 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;
 
-    private String accidentType;
+    private Byte accidentType;
 
-    private String accidentGrade;
+    private Byte accidentGrade;
 
     private BigDecimal economicLoss;
 
@@ -33,7 +101,7 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reportDeadline;
 
-    private String accidentLevel;
+    private Byte accidentLevel;
 
     private String accidentDelayApply;
 
@@ -56,14 +124,6 @@
 
     private List<AccidentReportFileRespDTO> fileList;
 
-    public Boolean getStatus() {
-        return status;
-    }
-
-    public void setStatus(Boolean status) {
-        this.status = status;
-    }
-
     public Long getId() {
         return id;
     }
@@ -80,19 +140,19 @@
         this.accidentExpressId = accidentExpressId;
     }
 
-    public String getAccidentType() {
+    public Byte getAccidentType() {
         return accidentType;
     }
 
-    public void setAccidentType(String accidentType) {
+    public void setAccidentType(Byte accidentType) {
         this.accidentType = accidentType;
     }
 
-    public String getAccidentGrade() {
+    public Byte getAccidentGrade() {
         return accidentGrade;
     }
 
-    public void setAccidentGrade(String accidentGrade) {
+    public void setAccidentGrade(Byte accidentGrade) {
         this.accidentGrade = accidentGrade;
     }
 
@@ -144,11 +204,11 @@
         this.reportDeadline = reportDeadline;
     }
 
-    public String getAccidentLevel() {
+    public Byte getAccidentLevel() {
         return accidentLevel;
     }
 
-    public void setAccidentLevel(String accidentLevel) {
+    public void setAccidentLevel(Byte accidentLevel) {
         this.accidentLevel = accidentLevel;
     }
 

--
Gitblit v1.9.2