From fdd02ce546bc7e312e469e62d3473d9517a8a961 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:22:15 +0800
Subject: [PATCH] 同步获取吉安机巢无人机设备
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml
index 4acd1e8..d0f22dc 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml
@@ -13,6 +13,8 @@
<result column="skilled_uav_type" property="skilledUavType"/>
<result column="skilled_task_type" property="skilledTaskType"/>
<result column="area_code" property="areaCode"/>
+ <result column="flyer_address" property="flyerAddress"/>
+ <result column="certification" property="certification" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -22,9 +24,40 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <resultMap id="gdFlyerVOResultMap" type="org.sxkj.gd.flyer.vo.GdFlyerVO">
+ <result column="id" property="id"/>
+ <result column="flyer_name" property="flyerName"/>
+ <result column="flyer_phone" property="flyerPhone"/>
+ <result column="flight_hours" property="flightHours"/>
+ <result column="project_experience" property="projectExperience"/>
+ <result column="technical_strength" property="technicalStrength"/>
+ <result column="skilled_uav_type" property="skilledUavType"/>
+ <result column="skilled_task_type" property="skilledTaskType"/>
+ <result column="area_code" property="areaCode"/>
+ <result column="flyer_address" property="flyerAddress"/>
+ <result column="certification" property="certification" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+ </resultMap>
- <select id="selectGdFlyerPage" resultMap="gdFlyerResultMap">
- select * from ja_gd_flyer where is_deleted = 0
+ <select id="selectGdFlyerPage" resultMap="gdFlyerVOResultMap">
+ select * from ja_gd_flyer
+ <where>
+ is_deleted = 0
+ <if test="param2.flyerName != null and param2.flyerName != ''">
+ and flyer_name like concat('%',#{param2.flyerName},'%')
+ </if>
+ <if test="param2.flyerPhone != null and param2.flyerPhone != ''">
+ and flyer_phone like concat('%',#{param2.flyerPhone},'%')
+ </if>
+ <if test="param2.technicalStrength != null and param2.technicalStrength != ''">
+ and technical_strength = #{param2.technicalStrength}
+ </if>
+ <if test="param2.skilledUavType != null and param2.skilledUavType != ''">
+ and skilled_uav_type = #{param2.skilledUavType}
+ </if>
+ <if test="param2.skilledTaskType != null and param2.skilledTaskType != ''">
+ and skilled_task_type = #{param2.skilledTaskType}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3