From 074fe52e0ed01d4e303658dfc77f23d84fa984b6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 09:54:27 +0800
Subject: [PATCH] fix(workorder): 修复算法ID参数设置问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 7a9c39d..728a605 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
@@ -26,6 +26,7 @@
<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"/>
@@ -36,11 +37,18 @@
<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,16 +65,17 @@
<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.deptList != null and param2.deptList.size > 0">
- AND create_dept in
- <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
- </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=")"> -->
+ <!-- #{deptId} -->
+ <!-- </foreach> -->
+ <!-- </if> -->
</where>
+ ORDER BY area_match_flag DESC, create_time DESC
</select>
--
Gitblit v1.9.3