From 0a79e4295745bc59c0f8b8624218df7a226d14b9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 26 Feb 2026 18:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 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
new file mode 100644
index 0000000..dbbf71c
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.sxkj.gd.workorder.mapper.GdDeviceCallMapper">
+
+    <!-- 通用查询映射结果 -->
+    <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"/>
+        <result column="device_name" property="deviceName"/>
+        <result column="plan_execute_time" property="planExecuteTime"/>
+        <result column="actual_execute_time" property="actualExecuteTime"/>
+        <result column="area_code" property="areaCode"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectGdDeviceCallPage" resultMap="gdDeviceCallResultMap">
+        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>
+
+
+    <select id="exportGdDeviceCall" resultType="org.sxkj.gd.workorder.excel.GdDeviceCallExcel">
+        SELECT * FROM ja_gd_device_call ${ew.customSqlSegment}
+    </select>
+
+</mapper>

--
Gitblit v1.9.3