From fefe259f19a251d90d17d8a42e04f6332a4cad3e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 15:37:30 +0800
Subject: [PATCH] sql 优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdApplicationInnovationDTO.java | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
index fc80e62..b132290 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -27,7 +27,7 @@
<select id="selectFwDefenseScenePage" resultMap="fwDefenseSceneResultMap">
select * from ja_fw_defense_scene
<where>
- is_deleted = 0
+ and is_deleted = 0
<if test="param2.id != null and param2.id != ''">
and id = #{param2.id}
</if>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdApplicationInnovationDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdApplicationInnovationDTO.java
index 84d1b16..f8f69fe 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdApplicationInnovationDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdApplicationInnovationDTO.java
@@ -49,7 +49,7 @@
/**
* 应用创新状态（审核中/审核通过/审核不通过）
*/
- @ApiModelProperty(value = "应用创新状态（审核中/审核通过/审核不通过）")
+ @ApiModelProperty(value = "应用创新状态（1.审核中/2.审核通过/3.审核不通过）")
private String innovationStatus;
/**
* 应用场景描述
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml
index 75bc0da..3270b58 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml
@@ -33,7 +33,7 @@
<if test="param2.innovationStatus != null and param2.innovationStatus != ''">
and innovation_status = #{param2.innovationStatus}
</if>
- is_deleted = 0
+ and is_deleted = 0
</where>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java
index 99fbb24..5d8fa14 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java
@@ -14,7 +14,7 @@
/**
* 应用创新状态（审核中/审核通过/审核不通过）
*/
- @ApiModelProperty(value = "应用创新状态（审核中/审核通过/审核不通过）")
+ @ApiModelProperty(value = "应用创新状态（1.审核中/2.审核通过/3.审核不通过）")
private String innovationStatus;
}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
index 32cc4ea..eb32dc8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
@@ -49,7 +49,7 @@
<if test="location != null and location != ''">
and location like concat('%',#{location},'%')
</if>
- is_deleted = 0
+ and is_deleted = 0
</where>
</select>
@@ -86,7 +86,7 @@
<if test="geom != null and geom != ''">
and ST_Intersects(geom, ST_GeomFromText(#{geom}))
</if>
- is_deleted = 0
+ and is_deleted = 0
</where>
--
Gitblit v1.9.3