From b1f7d9f1c9a23c2e360d93d1ee60e03cc94a78d2 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 12 Jan 2026 11:08:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index e016966..1e9074f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -15,8 +15,6 @@
<result column="response_mechanism" property="responseMechanism"/>
<result column="control_level" property="controlLevel"/>
<result column="police_station_id" property="policeStationId"/>
- <result column="fly_time_start" property="flyTimeStart"/>
- <result column="fly_time_end" property="flyTimeEnd"/>
<result column="fly_date_start" property="flyDateStart"/>
<result column="fly_date_end" property="flyDateEnd"/>
<result column="area_code" property="areaCode"/>
@@ -46,8 +44,6 @@
ad.response_mechanism,
ad.control_level,
ad.police_station_id,
- ad.fly_time_start,
- ad.fly_time_end,
ad.fly_date_start,
ad.fly_date_end,
ad.area_code,
@@ -104,12 +100,6 @@
<if test="param2.policeStationId != null and param2.policeStationId != ''">
and ad.police_station_id = #{param2.policeStationId}
</if>
- <if test="param2.flyTimeStart != null and param2.flyTimeStart != ''">
- and ad.fly_time_start >= #{param2.flyTimeStart}
- </if>
- <if test="param2.flyTimeEnd != null and param2.flyTimeEnd != ''">
- and ad.fly_time_end <= #{param2.flyTimeEnd}
- </if>
<if test="param2.flyDateStart != null and param2.flyDateStart != ''">
and ad.fly_date_start >= #{param2.flyDateStart}
</if>
@@ -135,8 +125,6 @@
ad.response_mechanism,
ad.control_level,
ad.police_station_id,
- ad.fly_time_start,
- ad.fly_time_end,
ad.fly_date_start,
ad.fly_date_end,
ad.area_code,
@@ -170,8 +158,6 @@
response_mechanism,
control_level,
police_station_id,
- fly_time_start,
- fly_time_end,
fly_date_start,
fly_date_end,
area_code,
@@ -198,8 +184,6 @@
response_mechanism,
control_level,
police_station_id,
- fly_time_start,
- fly_time_end,
fly_date_start,
fly_date_end,
area_code,
@@ -232,8 +216,6 @@
#{responseMechanism},
#{controlLevel},
#{policeStationId},
- #{flyTimeStart},
- #{flyTimeEnd},
#{flyDateStart},
#{flyDateEnd},
#{areaCode},
@@ -267,8 +249,6 @@
<if test="responseMechanism != null">response_mechanism = #{responseMechanism},</if>
<if test="controlLevel != null">control_level = #{controlLevel},</if>
<if test="policeStationId != null">police_station_id = #{policeStationId},</if>
- <if test="flyTimeStart != null">fly_time_start = #{flyTimeStart},</if>
- <if test="flyTimeEnd != null">fly_time_end = #{flyTimeEnd},</if>
<if test="flyDateStart != null">fly_date_start = #{flyDateStart},</if>
<if test="flyDateEnd != null">fly_date_end = #{flyDateEnd},</if>
<if test="areaCode != null">area_code = #{areaCode},</if>
--
Gitblit v1.9.3