From 7473859cd3ee464fde053435f7c2da5aab71aa9b Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 10:02:14 +0800
Subject: [PATCH] 巡查任务报告及工单事件详情根据经纬度返回详细地址
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 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 6b437a1..51d41fd 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
@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.gd.workorder.mapper.GdWorkOrderMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="gdWorkOrderResultMap" type="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ <resultMap id="gdWorkOrderResultMap" type="org.sxkj.gd.workorder.vo.GdWorkOrderVO">
<result column="id" property="id"/>
<result column="work_order_name" property="workOrderName"/>
<result column="work_order_code" property="workOrderCode"/>
@@ -39,6 +39,7 @@
service_party,
ST_AsText(geom) geom,
remark,
+ reject_reason,
area_code,
create_user,
create_dept,
@@ -54,44 +55,46 @@
<select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
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,
- ST_AsText(geom) geom,
- remark,
- area_code,
- create_user,
- create_dept,
- create_time,
- update_user,
- update_time,
- status,
- is_deleted
- from ja_gd_work_order
+ 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>
<if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
- and work_order_status like concat(#{param2.workOrderStatus},'%')
+ and wo.work_order_status like concat(#{param2.workOrderStatus},'%')
</if>
<if test="param2.workOrderName != null and param2.workOrderName != ''">
- and work_order_name like concat('%',#{param2.workOrderName},'%')
+ and wo.work_order_name like concat('%',#{param2.workOrderName},'%')
</if>
<if test="param2.workOrderType != null and param2.workOrderType != ''">
- and work_order_type = #{param2.workOrderType}
+ and wo.work_order_type = #{param2.workOrderType}
</if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and create_user = #{param2.createUser}
+ <if test="param2.createUser != null ">
+ and wo.create_user = #{param2.createUser}
</if>
<if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
- and create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
+ and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
</if>
- and is_deleted = 0
+ and wo.is_deleted = 0
</where>
</select>
--
Gitblit v1.9.3