From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java |  393 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 308 insertions(+), 85 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..47fcd80 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,43 +8,283 @@
 
 public class EmergencyDrillEvaluationDetailRespDTO {
 
+    // 应急预案名称
+    private String emergencyPlanName;
+    // 计划制定人名称
+    private String makingUserName;
+
+    public String getEmergencyPlanName() {
+        return emergencyPlanName;
+    }
+
+    public void setEmergencyPlanName(String emergencyPlanName) {
+        this.emergencyPlanName = emergencyPlanName;
+    }
+
+    public String getMakingUserName() {
+        return makingUserName;
+    }
+
+    public void setMakingUserName(String makingUserName) {
+        this.makingUserName = makingUserName;
+    }
+    //计划制定日期
+    @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;
+    //计划制定人uid
+    private Long makingUserUid;
+    //计划制定部门ID
+    private Long makingDepartmentId;
+    //主办部门ID
+    private Long departmentId;
+    //演练经费
+    private BigDecimal drillExpense;
+    //演练级别(数据字典)
+    private Byte drillLevel;
+    //演练地点
+    private String drillAddress;
+    //演练名称
+    private String drillName;
+    //演练方式(数据字典)
+    private Byte drillWay;
+    //保险措施
+    private String insuranceMeasures;
+    //备注
+    private String remark;
+    //演练目的
+    private String purpose;
+    //演练计划文件列表
+    private List<EmergencyDrillPlanFileRespDTO> planFileList;
+    //演练计划人员列表
+    private List<EmergencyDrillPlanUserRespDTO> planUserList;
+    //演练计划负责人人员列表
+    private List<EmergencyDrillPlanUserRespDTO> planChargeUserList;
+
+    public List<EmergencyDrillPlanUserRespDTO> getPlanChargeUserList() {
+        return planChargeUserList;
+    }
+
+    public void setPlanChargeUserList(List<EmergencyDrillPlanUserRespDTO> planChargeUserList) {
+        this.planChargeUserList = planChargeUserList;
+    }
+
+    // 应急演练实施
+
+    //记录人名称
+    private String recordUserName;
+
+    public String getRecordUserName() {
+        return recordUserName;
+    }
+
+    public void setRecordUserName(String recordUserName) {
+        this.recordUserName = recordUserName;
+    }
+    //演练计划id
+    private Long drillPlanId;
+    //演练记录时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date drillRecordDate;
+    //记录人uid
+    private Long recordUserUid;
+    //演练过程描述
+    private String processDesc;
+    //演练计划实施人员列表
+    private List<EmergencyDrillExecuteUserRespDTO> executeUserList;
+
+    // 评价id
     private Long id;
-
+    //演练实施ID
     private Long drillExecuteId;
-
-    private String suitable;
-
-    private String sufficient;
-
-    private String arrival;
-
-    private String supplies;
-
-    private String protection;
-
-    private String whole;
-
-    private String division;
-
-    private String effect;
-
-    private String report;
-
-    private String safety;
-
-    private String rescue;
-
-    private String evacuate;
-
+    //适宜性
+    private Byte suitable;
+    //充分性
+    private Byte sufficient;
+    //人员到位情况
+    private Byte arrival;
+    //物资到位情况-现场物资
+    private Byte supplies;
+    //物资到位情况-个人防护
+    private Byte protection;
+    //协调组织情况-整体组织
+    private Byte whole;
+    //协调组织情况-疏散组分工
+    private Byte division;
+    //实战效果评价
+    private Byte effect;
+    //支援部门和协作有效性-报告上级
+    private Byte report;
+    //支援部门和协作有效性-安全部门
+    private Byte safety;
+    //支援部门和协作有效性-救援后勤部门
+    private Byte rescue;
+    //支援部门和协作有效性-警戒撤离配合
+    private Byte evacuate;
+    //是否需要修改应急预案:0否1是
     private Boolean needModify;
-
+    //存在问题和改进措施
     private String questionAndImprove;
-
+    //修改内容
     private String modifyContent;
+    //评价文件列表
+    private List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;
+    //评价人员列表
+    private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;
 
-    private List<EmergencyDrillEvaluationFileRespDTO> fileList;
+    public Date getMakingPlanDate() {
+        return makingPlanDate;
+    }
 
-    private List<EmergencyDrillEvaluationUserRespDTO> userList;
+    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 Byte getDrillLevel() {
+        return drillLevel;
+    }
+
+    public void setDrillLevel(Byte 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 Byte getDrillWay() {
+        return drillWay;
+    }
+
+    public void setDrillWay(Byte 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;
@@ -62,99 +302,99 @@
         this.drillExecuteId = drillExecuteId;
     }
 
-    public String getSuitable() {
+    public Byte getSuitable() {
         return suitable;
     }
 
-    public void setSuitable(String suitable) {
+    public void setSuitable(Byte suitable) {
         this.suitable = suitable;
     }
 
-    public String getSufficient() {
+    public Byte getSufficient() {
         return sufficient;
     }
 
-    public void setSufficient(String sufficient) {
+    public void setSufficient(Byte sufficient) {
         this.sufficient = sufficient;
     }
 
-    public String getArrival() {
+    public Byte getArrival() {
         return arrival;
     }
 
-    public void setArrival(String arrival) {
+    public void setArrival(Byte arrival) {
         this.arrival = arrival;
     }
 
-    public String getSupplies() {
+    public Byte getSupplies() {
         return supplies;
     }
 
-    public void setSupplies(String supplies) {
+    public void setSupplies(Byte supplies) {
         this.supplies = supplies;
     }
 
-    public String getProtection() {
+    public Byte getProtection() {
         return protection;
     }
 
-    public void setProtection(String protection) {
+    public void setProtection(Byte protection) {
         this.protection = protection;
     }
 
-    public String getWhole() {
+    public Byte getWhole() {
         return whole;
     }
 
-    public void setWhole(String whole) {
+    public void setWhole(Byte whole) {
         this.whole = whole;
     }
 
-    public String getDivision() {
+    public Byte getDivision() {
         return division;
     }
 
-    public void setDivision(String division) {
+    public void setDivision(Byte division) {
         this.division = division;
     }
 
-    public String getEffect() {
+    public Byte getEffect() {
         return effect;
     }
 
-    public void setEffect(String effect) {
+    public void setEffect(Byte effect) {
         this.effect = effect;
     }
 
-    public String getReport() {
+    public Byte getReport() {
         return report;
     }
 
-    public void setReport(String report) {
+    public void setReport(Byte report) {
         this.report = report;
     }
 
-    public String getSafety() {
+    public Byte getSafety() {
         return safety;
     }
 
-    public void setSafety(String safety) {
+    public void setSafety(Byte safety) {
         this.safety = safety;
     }
 
-    public String getRescue() {
+    public Byte getRescue() {
         return rescue;
     }
 
-    public void setRescue(String rescue) {
+    public void setRescue(Byte rescue) {
         this.rescue = rescue;
     }
 
-    public String getEvacuate() {
+    public Byte getEvacuate() {
         return evacuate;
     }
 
-    public void setEvacuate(String evacuate) {
+    public void setEvacuate(Byte evacuate) {
         this.evacuate = evacuate;
     }
 
@@ -182,44 +422,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