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/workorder/mapper/GdWorkOrderMapper.xml | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
index 51d41fd..57f28f6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
@@ -52,33 +52,60 @@
where id = #{id}
</select>
+ <select id="getWorkOrderByIdWithoutGeom" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ select id,
+ work_order_name,
+ work_order_code,
+ work_order_type,
+ device_load_demand,
+ recommend_device_ids,
+ work_order_status,
+ execute_start_time,
+ execute_end_time,
+ service_party,
+ remark,
+ ST_AsText(geom) geom,
+ reject_reason,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ from ja_gd_work_order
+ where id = #{id}
+ </select>
+
<select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
select
- wo.id,
- wo.work_order_name,
- wo.work_order_code,
- wo.work_order_type,
- wo.device_load_demand,
- wo.recommend_device_ids,
- wo.work_order_status,
- wo.execute_start_time,
- wo.execute_end_time,
- wo.service_party,
- ST_AsText(wo.geom) geom,
- wo.remark,
- wo.area_code,
- wo.create_user,
- wo.create_dept,
- wo.create_time,
- wo.update_user,
- wo.update_time,
- wo.status,
- wo.is_deleted,
- bu.name create_user_name
+ wo.id,
+ wo.work_order_name,
+ wo.work_order_code,
+ wo.work_order_type,
+ wo.device_load_demand,
+ wo.recommend_device_ids,
+ wo.work_order_status,
+ wo.execute_start_time,
+ wo.execute_end_time,
+ wo.service_party,
+ ST_AsText(wo.geom) geom,
+ wo.remark,
+ wo.area_code,
+ wo.create_user,
+ wo.create_dept,
+ wo.create_time,
+ wo.update_user,
+ wo.update_time,
+ wo.status,
+ wo.is_deleted,
+ bu.name create_user_name
from ja_gd_work_order wo
left join blade_user bu on wo.create_user = bu.id
<where>
+ and wo.is_deleted = 0
<if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
and wo.work_order_status like concat(#{param2.workOrderStatus},'%')
</if>
@@ -94,7 +121,12 @@
<if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
</if>
- and wo.is_deleted = 0
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and wo.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
</where>
</select>
--
Gitblit v1.9.3