From 08d4bb2bf4bfadc9ab5fcf6b0a2bfb543d22b2a0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:13:10 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 34d569a..2fd3088 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
@@ -24,10 +24,28 @@
<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_id" property="flyerId"/>
+ <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
+ <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>
@@ -43,6 +61,16 @@
<if test="param2.skilledTaskType != null and param2.skilledTaskType != ''">
and skilled_task_type = #{param2.skilledTaskType}
</if>
+
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and area_code like concat('%',#{param2.areaCode},'%')
+ </if>
+ <!-- <if test="param2.deptList != null and param2.deptList.size > 0"> -->
+ <!-- AND create_dept in -->
+ <!-- <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> -->
+ <!-- #{deptId} -->
+ <!-- </foreach> -->
+ <!-- </if> -->
</where>
</select>
--
Gitblit v1.9.3