From 3705ec13069cb71c8d7369e9bb58f73f271b792d Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 01 八月 2022 15:33:32 +0800
Subject: [PATCH] 应急评价详情fix

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java |  247 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 214 insertions(+), 33 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
index 88537b9..927b291 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
@@ -8,6 +8,52 @@
 
 public class EmergencyDrillEvaluationDetailRespDTO {
 
+    // 应急演练计划
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date makingPlanDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date drillPlanDate;
+
+    private Long makingUserUid;
+
+    private Long makingDepartmentId;
+
+    private Long departmentId;
+
+    private BigDecimal drillExpense;
+
+    private String drillLevel;
+
+    private String drillAddress;
+
+    private String drillName;
+
+    private String drillWay;
+
+    private String insuranceMeasures;
+
+    private String remark;
+
+    private String purpose;
+
+    private List<EmergencyDrillPlanFileRespDTO> planFileList;
+
+    private List<EmergencyDrillPlanUserRespDTO> planUserList;
+
+    // 应急演练实施
+    private Long drillPlanId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date drillRecordDate;
+
+    private Long recordUserUid;
+
+    private String processDesc;
+
+    private List<EmergencyDrillExecuteUserRespDTO> executeUserList;
+
+    // 评价
     private Long id;
 
     private Long drillExecuteId;
@@ -42,9 +88,161 @@
 
     private String modifyContent;
 
-    private List<EmergencyDrillEvaluationFileRespDTO> fileList;
+    private List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;
 
-    private List<EmergencyDrillEvaluationUserRespDTO> userList;
+    private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;
+
+    public Date getMakingPlanDate() {
+        return makingPlanDate;
+    }
+
+    public void setMakingPlanDate(Date makingPlanDate) {
+        this.makingPlanDate = makingPlanDate;
+    }
+
+    public Date getDrillPlanDate() {
+        return drillPlanDate;
+    }
+
+    public void setDrillPlanDate(Date drillPlanDate) {
+        this.drillPlanDate = drillPlanDate;
+    }
+
+    public Long getMakingUserUid() {
+        return makingUserUid;
+    }
+
+    public void setMakingUserUid(Long makingUserUid) {
+        this.makingUserUid = makingUserUid;
+    }
+
+    public Long getMakingDepartmentId() {
+        return makingDepartmentId;
+    }
+
+    public void setMakingDepartmentId(Long makingDepartmentId) {
+        this.makingDepartmentId = makingDepartmentId;
+    }
+
+    public Long getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(Long departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public BigDecimal getDrillExpense() {
+        return drillExpense;
+    }
+
+    public void setDrillExpense(BigDecimal drillExpense) {
+        this.drillExpense = drillExpense;
+    }
+
+    public String getDrillLevel() {
+        return drillLevel;
+    }
+
+    public void setDrillLevel(String drillLevel) {
+        this.drillLevel = drillLevel;
+    }
+
+    public String getDrillAddress() {
+        return drillAddress;
+    }
+
+    public void setDrillAddress(String drillAddress) {
+        this.drillAddress = drillAddress;
+    }
+
+    public String getDrillName() {
+        return drillName;
+    }
+
+    public void setDrillName(String drillName) {
+        this.drillName = drillName;
+    }
+
+    public String getDrillWay() {
+        return drillWay;
+    }
+
+    public void setDrillWay(String drillWay) {
+        this.drillWay = drillWay;
+    }
+
+    public String getInsuranceMeasures() {
+        return insuranceMeasures;
+    }
+
+    public void setInsuranceMeasures(String insuranceMeasures) {
+        this.insuranceMeasures = insuranceMeasures;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getPurpose() {
+        return purpose;
+    }
+
+    public void setPurpose(String purpose) {
+        this.purpose = purpose;
+    }
+
+    public List<EmergencyDrillPlanFileRespDTO> getPlanFileList() {
+        return planFileList;
+    }
+
+    public void setPlanFileList(List<EmergencyDrillPlanFileRespDTO> planFileList) {
+        this.planFileList = planFileList;
+    }
+
+    public List<EmergencyDrillPlanUserRespDTO> getPlanUserList() {
+        return planUserList;
+    }
+
+    public void setPlanUserList(List<EmergencyDrillPlanUserRespDTO> planUserList) {
+        this.planUserList = planUserList;
+    }
+
+    public Date getDrillRecordDate() {
+        return drillRecordDate;
+    }
+
+    public void setDrillRecordDate(Date drillRecordDate) {
+        this.drillRecordDate = drillRecordDate;
+    }
+
+    public Long getRecordUserUid() {
+        return recordUserUid;
+    }
+
+    public void setRecordUserUid(Long recordUserUid) {
+        this.recordUserUid = recordUserUid;
+    }
+
+    public String getProcessDesc() {
+        return processDesc;
+    }
+
+    public void setProcessDesc(String processDesc) {
+        this.processDesc = processDesc;
+    }
+
+    public List<EmergencyDrillExecuteUserRespDTO> getExecuteUserList() {
+        return executeUserList;
+    }
+
+    public void setExecuteUserList(List<EmergencyDrillExecuteUserRespDTO> executeUserList) {
+        this.executeUserList = executeUserList;
+    }
 
     public Long getId() {
         return id;
@@ -182,44 +380,27 @@
         this.modifyContent = modifyContent;
     }
 
-    public List<EmergencyDrillEvaluationFileRespDTO> getFileList() {
-        return fileList;
+    public List<EmergencyDrillEvaluationFileRespDTO> getEvaluationFileList() {
+        return evaluationFileList;
     }
 
-    public void setFileList(List<EmergencyDrillEvaluationFileRespDTO> fileList) {
-        this.fileList = fileList;
+    public void setEvaluationFileList(List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList) {
+        this.evaluationFileList = evaluationFileList;
     }
 
-    public List<EmergencyDrillEvaluationUserRespDTO> getUserList() {
-        return userList;
+    public List<EmergencyDrillEvaluationUserRespDTO> getEvaluationUserList() {
+        return evaluationUserList;
     }
 
-    public void setUserList(List<EmergencyDrillEvaluationUserRespDTO> userList) {
-        this.userList = userList;
+    public void setEvaluationUserList(List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList) {
+        this.evaluationUserList = evaluationUserList;
     }
 
-    @Override
-    public String toString() {
-        return "EmergencyDrillEvaluationDetailRespDTO{" +
-                "id=" + id +
-                ", drillExecuteId=" + drillExecuteId +
-                ", suitable='" + suitable + '\'' +
-                ", sufficient='" + sufficient + '\'' +
-                ", arrival='" + arrival + '\'' +
-                ", supplies='" + supplies + '\'' +
-                ", protection='" + protection + '\'' +
-                ", whole='" + whole + '\'' +
-                ", division='" + division + '\'' +
-                ", effect='" + effect + '\'' +
-                ", report='" + report + '\'' +
-                ", safety='" + safety + '\'' +
-                ", rescue='" + rescue + '\'' +
-                ", evacuate='" + evacuate + '\'' +
-                ", needModify=" + needModify +
-                ", questionAndImprove='" + questionAndImprove + '\'' +
-                ", modifyContent='" + modifyContent + '\'' +
-                ", fileList=" + fileList +
-                ", userList=" + userList +
-                '}';
+    public Long getDrillPlanId() {
+        return drillPlanId;
+    }
+
+    public void setDrillPlanId(Long drillPlanId) {
+        this.drillPlanId = drillPlanId;
     }
 }

--
Gitblit v1.9.2