From 618ece4b9b22c2b9a4e85b46f0b3ec99c53e200b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 16:38:55 +0800
Subject: [PATCH] opt: sql改造其他模块改造12
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
index 45784e3..dbbf71c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
@@ -6,7 +6,9 @@
<resultMap id="gdDeviceCallResultMap" type="org.sxkj.gd.workorder.entity.GdDeviceCallEntity">
<result column="id" property="id"/>
<result column="patrol_task_name" property="patrolTaskName"/>
+ <result column="task_department_id" property="taskDepartmentId"/>
<result column="task_department" property="taskDepartment"/>
+ <result column="task_initiator_id" property="taskInitiatorId"/>
<result column="task_initiator" property="taskInitiator"/>
<result column="flight_duration" property="flightDuration"/>
<result column="flight_distance" property="flightDistance"/>
@@ -25,7 +27,19 @@
<select id="selectGdDeviceCallPage" resultMap="gdDeviceCallResultMap">
- select * from ja_gd_device_call where is_deleted = 0
+ select * from ja_gd_device_call
+ <where>
+ is_deleted = 0
+ <if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
+ and patrol_task_name like concat('%',#{param2.patrolTaskName},'%')
+ </if>
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and device_id = #{param2.deviceId}
+ </if>
+ <if test="param2.taskInitiatorId != null and param2.taskInitiatorId != ''">
+ and task_initiator_id = #{param2.taskInitiatorId}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3