From f6579c4adfa07e9d9c74a21e87e65aebe6830822 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 12:28:07 +0800
Subject: [PATCH] feat(workorder): 添加线索事件的geojson和附件类型字段
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index 81dc8a5..d35b67e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -8,7 +8,7 @@
<result column="work_order_id" property="workOrderId"/>
<result column="work_order_name" property="workOrderName"/>
<result column="patrol_task_name" property="patrolTaskName"/>
- <result column="patrol_task_type" property="patrolTaskType"/>
+ <result column="patrol_task_type" property="patrolTaskType" typeHandler="org.sxkj.common.handler.GenericListTypeHandler"/>
<result column="execute_time" property="executeTime"/>
<result column="patrol_route_url" property="patrolRouteUrl"/>
<result column="recommend_flyer_name" property="recommendFlyerName"/>
@@ -26,6 +26,7 @@
<result column="is_deleted" property="isDeleted"/>
<result column="result_count" property="resultCount"/>
<result column="issue_event_count" property="issueEventCount"/>
+ <result column="algorithm_ids" property="algorithmIds" typeHandler="org.sxkj.common.handler.ListToStringTypeHandler"/>
</resultMap>
@@ -64,7 +65,13 @@
and pt.patrol_task_name like concat('%',#{param2.patrolTaskName},'%')
</if>
<if test="param2.patrolTaskType != null and param2.patrolTaskType != ''">
- and pt.patrol_task_type::VARCHAR = #{param2.patrolTaskType}::VARCHAR
+ /* 将逗号分隔的字符串转换为带引号的格式，如 "road,road1" 转为 "\"road\",\"road1\"" */
+ and pt.patrol_task_type like concat('%',
+ (
+ select string_agg(concat('"', trim(arr_val), '"'), ',')
+ from unnest(string_to_array(#{param2.patrolTaskType}, ',')) as arr_val
+ ),
+ '%')
</if>
<if test="param2.taskStatus != null and param2.taskStatus != ''">
/* 报错信息中出现了这个参数，务必加强转 */
@@ -80,7 +87,7 @@
and pt.execute_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
</if>
</where>
- order by pt.create_time desc, pt.execute_time desc
+ order by pt.create_time desc, pt.execute_time asc
</select>
@@ -88,7 +95,7 @@
SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
</select>
- <select id="getPatrolTaskIdById" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ <select id="getPatrolTaskIdById" resultMap="gdPatrolTaskResultMap">
SELECT
pt.*,
md.airport_id as airport_id
@@ -100,7 +107,7 @@
</select>
- <select id="getPatrolTaskDetail" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ <select id="getPatrolTaskDetail" resultMap="gdPatrolTaskResultMap">
SELECT
pt.*,
md.airport_id as airport_id,
--
Gitblit v1.9.3