From d6827ed9a8e7ac1d8d3a932d2f93a8476df81806 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 13 七月 2022 15:32:56 +0800
Subject: [PATCH] 应急演练实施评价 fix
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml | 12 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java | 163 ----------------------------------------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java | 10 +-
3 files changed, 11 insertions(+), 174 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java
index b0d9443..5e9a17a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java
@@ -22,7 +22,7 @@
private EmergencyDrillEvaluationService emergencyDrillEvaluationService;
/**
- * 应急演练计划列表
+ * 应急演练实施评价列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
private ResultVO<List<EmergencyDrillEvaluationPageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillEvaluationQuery> pageQuery){
@@ -31,7 +31,7 @@
}
/**
- * 应急演练计划新增
+ * 应急演练实施评价新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO addEmergencyDrillEvaluation(Principal principal, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
@@ -40,7 +40,7 @@
}
/**
- * 应急演练计划详情
+ * 应急演练实施评价详情
*/
@RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
public ResultVO<EmergencyDrillEvaluationDetailRespDTO> getEmergencyDrillEvaluationById(@PathVariable("id")Long id){
@@ -48,7 +48,7 @@
}
/**
- * 应急演练计划修改
+ * 应急演练实施评价修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
public ResultVO updateEmergencyDrillEvaluation(Principal principal, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
@@ -57,7 +57,7 @@
}
/**
- * 应急演练计划删除/批量删除
+ * 应急演练实施评价删除/批量删除
*/
@RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
public ResultVO batchDeleteEmergencyDrillEvaluation(@PathVariable("ids")String ids){
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
index d65b993..6825661 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
@@ -6,35 +6,6 @@
private Long drillPlanId;
- 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 Boolean needModify;
-
- private String questionAndImprove;
-
- private String modifyContent;
public Long getId() {
return id;
@@ -52,146 +23,12 @@
this.drillPlanId = drillPlanId;
}
- public String getSuitable() {
- return suitable;
- }
-
- public void setSuitable(String suitable) {
- this.suitable = suitable;
- }
-
- public String getSufficient() {
- return sufficient;
- }
-
- public void setSufficient(String sufficient) {
- this.sufficient = sufficient;
- }
-
- public String getArrival() {
- return arrival;
- }
-
- public void setArrival(String arrival) {
- this.arrival = arrival;
- }
-
- public String getSupplies() {
- return supplies;
- }
-
- public void setSupplies(String supplies) {
- this.supplies = supplies;
- }
-
- public String getProtection() {
- return protection;
- }
-
- public void setProtection(String protection) {
- this.protection = protection;
- }
-
- public String getWhole() {
- return whole;
- }
-
- public void setWhole(String whole) {
- this.whole = whole;
- }
-
- public String getDivision() {
- return division;
- }
-
- public void setDivision(String division) {
- this.division = division;
- }
-
- public String getEffect() {
- return effect;
- }
-
- public void setEffect(String effect) {
- this.effect = effect;
- }
-
- public String getReport() {
- return report;
- }
-
- public void setReport(String report) {
- this.report = report;
- }
-
- public String getSafety() {
- return safety;
- }
-
- public void setSafety(String safety) {
- this.safety = safety;
- }
-
- public String getRescue() {
- return rescue;
- }
-
- public void setRescue(String rescue) {
- this.rescue = rescue;
- }
-
- public String getEvacuate() {
- return evacuate;
- }
-
- public void setEvacuate(String evacuate) {
- this.evacuate = evacuate;
- }
-
- public Boolean getNeedModify() {
- return needModify;
- }
-
- public void setNeedModify(Boolean needModify) {
- this.needModify = needModify;
- }
-
- public String getQuestionAndImprove() {
- return questionAndImprove;
- }
-
- public void setQuestionAndImprove(String questionAndImprove) {
- this.questionAndImprove = questionAndImprove;
- }
-
- public String getModifyContent() {
- return modifyContent;
- }
-
- public void setModifyContent(String modifyContent) {
- this.modifyContent = modifyContent;
- }
@Override
public String toString() {
return "EmergencyDrillEvaluationInfo{" +
"id=" + id +
", drillPlanId=" + drillPlanId +
- ", 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 + '\'' +
'}';
}
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
index 7e8a868..de27201 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
@@ -28,8 +28,8 @@
<if test="suitable != null and suitable != ''">`suitable`,</if>
<if test="sufficient != null and sufficient != ''">`sufficient`,</if>
<if test="arrival != null and arrival != ''">`arrival`,</if>
- <if test="supplies != null and purpose != ''">`supplies`,</if>
- <if test="protection != null and purpose != ''">`protection`,</if>
+ <if test="supplies != null and supplies != ''">`supplies`,</if>
+ <if test="protection != null and protection != ''">`protection`,</if>
<if test="whole != null and whole != ''">`whole`,</if>
<if test="division != null and division != ''">`division`,</if>
<if test="effect != null and effect != ''">`effect`,</if>
@@ -52,8 +52,8 @@
<if test="suitable != null and suitable != ''">#{suitable},</if>
<if test="sufficient != null and sufficient != ''">#{sufficient},</if>
<if test="arrival != null and arrival != ''">#{arrival},</if>
- <if test="supplies != null and purpose != ''">#{supplies},</if>
- <if test="protection != null and purpose != ''">#{protection},</if>
+ <if test="supplies != null and supplies != ''">#{supplies},</if>
+ <if test="protection != null and protection != ''">#{protection},</if>
<if test="whole != null and whole != ''">#{whole},</if>
<if test="division != null and division != ''">#{division},</if>
<if test="effect != null and effect != ''">#{effect},</if>
@@ -104,8 +104,8 @@
<if test="suitable != null and suitable != ''">suitable = #{suitable},</if>
<if test="sufficient != null and sufficient != ''">sufficient = #{sufficient},</if>
<if test="arrival != null and arrival != ''">arrival = #{arrival},</if>
- <if test="supplies != null and purpose != ''">supplies = #{supplies},</if>
- <if test="protection != null and purpose != ''">protection = #{protection},</if>
+ <if test="supplies != null and supplies != ''">supplies = #{supplies},</if>
+ <if test="protection != null and protection != ''">protection = #{protection},</if>
<if test="whole != null and whole != ''">whole = #{whole},</if>
<if test="division != null and division != ''">division = #{division},</if>
<if test="effect != null and effect != ''">effect = #{effect},</if>
--
Gitblit v1.9.2