From 8881f33ad0f9dac729ef021c72f96f340ae1d244 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 29 七月 2022 17:34:52 +0800
Subject: [PATCH] 演练计划 评价实施字段
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java | 10 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml | 27 ++-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java | 63 ++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java | 74 +++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java | 78 ++++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java | 61 ++++++++
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 32 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java | 10 +
12 files changed, 355 insertions(+), 48 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
index fc88b02..181ea19 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
@@ -22,7 +22,7 @@
private Long updateUid;
- private Long drillPlanId;
+ private Long drillExecuteId;
private String suitable;
@@ -102,12 +102,12 @@
this.updateUid = updateUid;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
public String getSuitable() {
@@ -239,7 +239,7 @@
", gmtModitify=" + gmtModitify +
", createUid=" + createUid +
", updateUid=" + updateUid +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
", suitable='" + suitable + '\'' +
", sufficient='" + sufficient + '\'' +
", arrival='" + arrival + '\'' +
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
index f82864b..3537573 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
@@ -10,7 +10,7 @@
@TableId(type = IdType.AUTO)
private Long id;
- private Long drillPlanId;
+ private Long drillExecuteId;
private String suitable;
@@ -50,12 +50,12 @@
this.id = id;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
public String getSuitable() {
@@ -182,7 +182,7 @@
public String toString() {
return "EmergencyDrillEvaluationInfo{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
", suitable='" + suitable + '\'' +
", sufficient='" + sufficient + '\'' +
", arrival='" + arrival + '\'' +
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java
index 88f016a..9ee2fc3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java
@@ -4,13 +4,75 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfoPageDO {
+
+ private String drillName;
+
+ private String drillAddress;
+
+ private String drillWay;
+
+ private String drillLevel;
+
+ private Date drillPlanDate;
+
+ private Date drillRecordDate;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
+ public String getDrillAddress() {
+ return drillAddress;
+ }
+
+ public void setDrillAddress(String drillAddress) {
+ this.drillAddress = drillAddress;
+ }
+
+ public String getDrillWay() {
+ return drillWay;
+ }
+
+ public void setDrillWay(String drillWay) {
+ this.drillWay = drillWay;
+ }
+
+ public String getDrillLevel() {
+ return drillLevel;
+ }
+
+ public void setDrillLevel(String drillLevel) {
+ this.drillLevel = drillLevel;
+ }
+
+ public Date getDrillPlanDate() {
+ return drillPlanDate;
+ }
+
+ public void setDrillPlanDate(Date drillPlanDate) {
+ this.drillPlanDate = drillPlanDate;
+ }
+
+ public Date getDrillRecordDate() {
+ return drillRecordDate;
+ }
+
+ public void setDrillRecordDate(Date drillRecordDate) {
+ this.drillRecordDate = drillRecordDate;
+ }
@TableId(type = IdType.AUTO)
private Long id;
- private Long drillPlanId;
+ private Long drillExecuteId;
public Long getId() {
@@ -21,12 +83,12 @@
this.id = id;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
@@ -34,7 +96,7 @@
public String toString() {
return "EmergencyDrillEvaluationInfo{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
'}';
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java
index 29d5b99..c9762ee 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_drill_execute")
public class EmergencyDrillExecuteInfoDetailDO {
+ private String drillName;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java
index 872169a..ce888c1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java
@@ -3,12 +3,73 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@TableName("emergency_drill_execute")
public class EmergencyDrillExecuteInfoPageDO {
+ private String drillName;
+
+ private String drillAddress;
+
+ private String drillWay;
+
+ private String drillLevel;
+
+ private Date drillPlanDate;
+
+ private String emergencyPlanName;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
+ public String getDrillAddress() {
+ return drillAddress;
+ }
+
+ public void setDrillAddress(String drillAddress) {
+ this.drillAddress = drillAddress;
+ }
+
+ public String getDrillWay() {
+ return drillWay;
+ }
+
+ public void setDrillWay(String drillWay) {
+ this.drillWay = drillWay;
+ }
+
+ public String getDrillLevel() {
+ return drillLevel;
+ }
+
+ public void setDrillLevel(String drillLevel) {
+ this.drillLevel = drillLevel;
+ }
+
+ public Date getDrillPlanDate() {
+ return drillPlanDate;
+ }
+
+ public void setDrillPlanDate(Date drillPlanDate) {
+ this.drillPlanDate = drillPlanDate;
+ }
+
+ public String getEmergencyPlanName() {
+ return emergencyPlanName;
+ }
+
+ public void setEmergencyPlanName(String emergencyPlanName) {
+ this.emergencyPlanName = emergencyPlanName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
index 8be8076..54552ae 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
@@ -11,7 +11,7 @@
private Long id;
- private Long drillPlanId;
+ private Long drillExecuteId;
private String suitable;
@@ -55,12 +55,12 @@
this.id = id;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
public String getSuitable() {
@@ -203,7 +203,7 @@
public String toString() {
return "EmergencyDrillEvaluationReqDTO{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
", suitable='" + suitable + '\'' +
", sufficient='" + sufficient + '\'' +
", arrival='" + arrival + '\'' +
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 860222e..88537b9 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
@@ -10,7 +10,7 @@
private Long id;
- private Long drillPlanId;
+ private Long drillExecuteId;
private String suitable;
@@ -54,12 +54,12 @@
this.id = id;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
public String getSuitable() {
@@ -202,7 +202,7 @@
public String toString() {
return "EmergencyDrillEvaluationDetailRespDTO{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
", suitable='" + suitable + '\'' +
", sufficient='" + sufficient + '\'' +
", arrival='" + arrival + '\'' +
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 6825661..bd06c30 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
@@ -1,10 +1,76 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
public class EmergencyDrillEvaluationPageRespDTO {
+
+ private String drillName;
+
+ private String drillAddress;
+
+ private String drillWay;
+
+ private String drillLevel;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date drillPlanDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date drillRecordDate;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
+ public String getDrillAddress() {
+ return drillAddress;
+ }
+
+ public void setDrillAddress(String drillAddress) {
+ this.drillAddress = drillAddress;
+ }
+
+ public String getDrillWay() {
+ return drillWay;
+ }
+
+ public void setDrillWay(String drillWay) {
+ this.drillWay = drillWay;
+ }
+
+ public String getDrillLevel() {
+ return drillLevel;
+ }
+
+ public void setDrillLevel(String drillLevel) {
+ this.drillLevel = drillLevel;
+ }
+
+ public Date getDrillPlanDate() {
+ return drillPlanDate;
+ }
+
+ public void setDrillPlanDate(Date drillPlanDate) {
+ this.drillPlanDate = drillPlanDate;
+ }
+
+ public Date getDrillRecordDate() {
+ return drillRecordDate;
+ }
+
+ public void setDrillRecordDate(Date drillRecordDate) {
+ this.drillRecordDate = drillRecordDate;
+ }
private Long id;
- private Long drillPlanId;
+ private Long drillExecuteId;
public Long getId() {
@@ -15,12 +81,12 @@
this.id = id;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
@@ -28,7 +94,7 @@
public String toString() {
return "EmergencyDrillEvaluationInfo{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
'}';
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
index b8aa3d8..630454e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
@@ -8,6 +8,16 @@
public class EmergencyDrillExecuteDetailRespDTO {
+ private String drillName;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
private Long id;
private Boolean status;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
index 879264c..e3b0c8a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
@@ -1,13 +1,72 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteUserReqDTO;
import java.util.Date;
-import java.util.List;
public class EmergencyDrillExecutePageRespDTO {
+ private String drillName;
+
+ private String drillAddress;
+
+ private String drillWay;
+
+ private String drillLevel;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date drillPlanDate;
+
+ private String emergencyPlanName;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
+
+ public String getDrillAddress() {
+ return drillAddress;
+ }
+
+ public void setDrillAddress(String drillAddress) {
+ this.drillAddress = drillAddress;
+ }
+
+ public String getDrillWay() {
+ return drillWay;
+ }
+
+ public void setDrillWay(String drillWay) {
+ this.drillWay = drillWay;
+ }
+
+ public String getDrillLevel() {
+ return drillLevel;
+ }
+
+ public void setDrillLevel(String drillLevel) {
+ this.drillLevel = drillLevel;
+ }
+
+ public Date getDrillPlanDate() {
+ return drillPlanDate;
+ }
+
+ public void setDrillPlanDate(Date drillPlanDate) {
+ this.drillPlanDate = drillPlanDate;
+ }
+
+ public String getEmergencyPlanName() {
+ return emergencyPlanName;
+ }
+
+ public void setEmergencyPlanName(String emergencyPlanName) {
+ this.emergencyPlanName = emergencyPlanName;
+ }
+
private Long id;
private Boolean status;
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 de27201..909dea5 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
@@ -7,11 +7,24 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoPageDO"
id="emergencyDrillEvaluationInfoPageDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="drill_plan_id" property="drillPlanId"/>
+ <result column="drill_execute_id" property="drillExecuteId"/>
</resultMap>
<select id="selectEmergencyDrillEvaluationList" resultMap="emergencyDrillEvaluationInfoPageDOResult">
- select id,`drill_plan_id` from emergency_drill_evaluation where del_flag = 0
+ SELECT
+ a.id,
+ c.drill_name AS drillName,
+ c.drill_address AS drillAddress,
+ c.drill_way AS drillWay,
+ c.drill_level AS drillLevel,
+ c.drill_plan_date AS drillPlanDate,
+ b.`drill_record_date` AS drillRecordDate
+ FROM
+ emergency_drill_evaluation a
+ LEFT JOIN emergency_drill_execute b ON a.drill_execute_id = b.id
+ LEFT JOIN emergency_drill_plan c ON b.drill_plan_id = c.id
+ WHERE
+ a.del_flag = 0
</select>
<insert id="addEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo"
@@ -24,7 +37,7 @@
<if test="gmtModitify != null ">gmt_moditify,</if>
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
- <if test="drillPlanId != null ">drill_plan_id,</if>
+ <if test="drillExecuteId != null ">drill_execute_id,</if>
<if test="suitable != null and suitable != ''">`suitable`,</if>
<if test="sufficient != null and sufficient != ''">`sufficient`,</if>
<if test="arrival != null and arrival != ''">`arrival`,</if>
@@ -48,7 +61,7 @@
<if test="gmtModitify != null ">#{gmtModitify},</if>
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
- <if test="drillPlanId != null ">#{drillPlanId},</if>
+ <if test="drillExecuteId != null ">#{drillExecuteId},</if>
<if test="suitable != null and suitable != ''">#{suitable},</if>
<if test="sufficient != null and sufficient != ''">#{sufficient},</if>
<if test="arrival != null and arrival != ''">#{arrival},</if>
@@ -70,7 +83,7 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoDetailDO" id="emergencyDrillEvaluationInfoDetailDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="drill_plan_id" property="drillPlanId"/>
+ <result column="drill_execute_id" property="drillExecuteId"/>
<result column="suitable" property="suitable"/>
<result column="sufficient" property="sufficient"/>
<result column="arrival" property="arrival"/>
@@ -89,7 +102,7 @@
</resultMap>
<select id="selectEmergencyDrillEvaluationById" resultMap="emergencyDrillEvaluationInfoDetailDOResult">
- select id ,`drill_plan_id`,`suitable`,`sufficient`,`arrival`,supplies ,protection ,whole ,division,
+ select id ,`drill_execute_id`,`suitable`,`sufficient`,`arrival`,supplies ,protection ,whole ,division,
effect ,report ,safety ,rescue ,evacuate ,need_modify ,question_and_improve ,modify_content
from emergency_drill_evaluation
where del_flag = 0 and id = #{id}
@@ -100,7 +113,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
<if test="updateUid != null ">update_uid = #{updateUid},</if>
- <if test="drillPlanId != null ">drill_plan_id = #{drillPlanId},</if>
+ <if test="drillExecuteId != null ">drill_execute_id = #{drillExecuteId},</if>
<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>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index d1accb3..6d51303 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -15,7 +15,21 @@
</resultMap>
<select id="selectEmergencyDrillExecuteList" resultMap="emergencyDrillExecuteInfoPageDOResult">
- select id,`status`,`drill_record_date`,`drill_plan_id`,`record_user_uid`,process_desc from emergency_drill_execute where del_flag = 0
+ SELECT
+ a.id,
+ b.drill_name as drillName,
+ b.drill_address as drillAddress,
+ b.drill_way as drillWay,
+ b.drill_level as drillLevel,
+ b.drill_plan_date as drillPlanDate,
+ a.`drill_record_date`,
+ c.`name` as emergencyPlanName
+ FROM
+ emergency_drill_execute a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ LEFT JOIN emergency_plan c ON b.plan_id = c.id
+ WHERE
+ a.del_flag = 0
</select>
<insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo"
@@ -61,8 +75,20 @@
</resultMap>
<select id="selectEmergencyDrillExecuteById" resultMap="emergencyDrillExecuteInfoDetailDOResult">
- select id,`status`,`drill_record_date`,`drill_plan_id`,`record_user_uid`,process_desc from emergency_drill_execute
- where del_flag = 0 and id = #{id}
+ SELECT
+ a.id,
+ a.`status`,
+ a.`drill_record_date`,
+ a.`drill_plan_id`,
+ a.`record_user_uid`,
+ a.process_desc,
+ b.drill_name AS drillName
+ FROM
+ emergency_drill_execute a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.id = #{id}
</select>
<update id="updateEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo">
--
Gitblit v1.9.2