From 44d635f05c258de50372cd7641f380ecdb90e74b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 29 七月 2022 16:35:02 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java | 9 +++++++++
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml | 4 +++-
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentExpressInfoMapper.xml | 2 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillPlanDBQuery.java | 9 +++++++++
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
index 120a25c..97c8a64 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
@@ -2,4 +2,13 @@
public class EmergencyDrillPlanQuery {
+ private String drillName;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillPlanDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillPlanDBQuery.java
index 76c01dc..db89f36 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillPlanDBQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillPlanDBQuery.java
@@ -2,4 +2,13 @@
public class EmergencyDrillPlanDBQuery {
+ private String drillName;
+
+ public String getDrillName() {
+ return drillName;
+ }
+
+ public void setDrillName(String drillName) {
+ this.drillName = drillName;
+ }
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
index 2926db3..001d78d 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
@@ -16,7 +16,9 @@
</resultMap>
<select id="selectEmergencyDrillPlanList" resultMap="emergencyDrillPlanInfoPageDOResult">
- select id,`drill_name`,`drill_address`,`drill_way`,`drill_level`,drill_plan_date ,gmt_moditify from emergency_drill_plan where del_flag = 0
+ select id,`drill_name`,`drill_address`,`drill_way`,`drill_level`,drill_plan_date ,gmt_moditify
+ from emergency_drill_plan where del_flag = 0
+ <if test="query.drillName != null and query.drillName != ''">and `drill_name` like concat('%', #{query.drillName}, '%')</if>
</select>
<insert id="addEmergencyDrillPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillPlanInfo"
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentExpressInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentExpressInfoMapper.xml
index 050c87a..563e4b6 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentExpressInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentExpressInfoMapper.xml
@@ -18,7 +18,7 @@
<select id="selectAccidentExpressList" resultMap="AccidentExpressInfoPageDOResult">
select id,`gmt_moditify`,`create_uid`,`accident_cause`,`occurrence_time`,occurrence_place ,accident_department_id ,accident_name
from accident_express where del_flag = 0
- <if test="query.accidentName != null and query.accidentName != ''">and `accident_name` like concat('%', #{query.accidentName}, '%')</if>
+`
</select>
<insert id="addAccidentExpress" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentExpressInfo"
--
Gitblit v1.9.2