From 3cbe09c3d14734798ba8662aeac633289afa2cf6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 15:19:36 +0800
Subject: [PATCH] opt: sql改造其他模块改造10
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 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 65c5416..fb45665 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
@@ -31,47 +31,49 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
select
- pt.*,
- md.nickname as device_name,
- wo.work_order_name,
- COALESCE(tr.result_count, 0) as result_count,
- COALESCE(tr.issue_event_count, 0) as issue_event_count
+ pt.*,
+ md.nickname as device_name,
+ wo.work_order_name,
+ COALESCE(tr.result_count, 0) as result_count,
+ COALESCE(tr.issue_event_count, 0) as issue_event_count
from
- ja_gd_patrol_task pt
+ ja_gd_patrol_task pt
left join
- ja_gd_work_order wo on pt.work_order_id = wo.id::VARCHAR
+ ja_gd_work_order wo on pt.work_order_id::VARCHAR = wo.id::VARCHAR
left join
- ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
+ ja_gd_manage_device md on md.id::VARCHAR = pt.device_id::VARCHAR
left join
- (
- select patrol_task_id,
- count(*) as result_count,
- sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
- from
- ja_gd_task_result
- where
- is_deleted = 0
- group by
- patrol_task_id
- ) tr on tr.patrol_task_id = pt.id::VARCHAR
+ (
+ select patrol_task_id,
+ count(*) as result_count,
+ sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
+ from
+ ja_gd_task_result
+ where
+ is_deleted = 0
+ group by
+ patrol_task_id
+ ) tr on tr.patrol_task_id::VARCHAR = pt.id::VARCHAR
<where>
- pt.is_deleted = 0
+ pt.is_deleted = 0
<if test="param2.workOrderId != null and param2.workOrderId != ''">
- and pt.work_order_id = #{param2.workOrderId}
+ /* 重点：参数也强制转类型 */
+ and pt.work_order_id::VARCHAR = #{param2.workOrderId}::VARCHAR
</if>
<if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
and pt.patrol_task_name like concat(#{param2.patrolTaskName},'%')
</if>
<if test="param2.patrolTaskType != null and param2.patrolTaskType != ''">
- and pt.patrol_task_type = #{param2.patrolTaskType}
+ and pt.patrol_task_type::VARCHAR = #{param2.patrolTaskType}::VARCHAR
</if>
<if test="param2.taskStatus != null and param2.taskStatus != ''">
- and pt.task_status = #{param2.taskStatus}
+ /* 报错信息中出现了这个参数，务必加强转 */
+ and pt.task_status::VARCHAR = #{param2.taskStatus}::VARCHAR
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and pt.create_dept in
+ and pt.create_dept::VARCHAR in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
- #{deptId}
+ #{deptId}::VARCHAR
</foreach>
</if>
<if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != '' ">
--
Gitblit v1.9.3