From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 743560e..2f2a9c5 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
@@ -11,7 +11,7 @@
<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="skilled_task_type" property="skilledTaskType" typeHandler="org.sxkj.common.handler.GenericListTypeHandler"/>
<result column="area_code" property="areaCode"/>
<result column="flyer_address" property="flyerAddress"/>
<result column="certification" property="certification" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
@@ -26,21 +26,29 @@
<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="skilled_task_type" property="skilledTaskType" typeHandler="org.sxkj.common.handler.GenericListTypeHandler"/>
<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="area_match_flag" property="areaMatchFlag"/>
</resultMap>
<select id="selectGdFlyerPage" resultMap="gdFlyerVOResultMap">
select
- *
+ *,
+ CASE
+ WHEN CAST(#{param2.skilledTaskType} AS VARCHAR) IS NOT NULL
+ AND CAST(#{param2.skilledTaskType} AS VARCHAR) != ''
+ AND skilled_task_type = #{param2.skilledTaskType} THEN 1
+ ELSE 0
+ END as area_match_flag
from
ja_gd_flyer
<where>
@@ -57,9 +65,9 @@
<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>
+ <!-- <if test="param2.skilledTaskType != null and param2.skilledTaskType != ''"> -->
+ <!-- and skilled_task_type = #{param2.skilledTaskType} -->
+ <!-- </if> -->
<!-- <if test="param2.deptList != null and param2.deptList.size > 0"> -->
<!-- AND create_dept in -->
<!-- <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> -->
@@ -67,6 +75,7 @@
<!-- </foreach> -->
<!-- </if> -->
</where>
+ ORDER BY area_match_flag DESC, create_time DESC
</select>
--
Gitblit v1.9.3