From ddd6344100ad8e5033b520090743c864fd923e0c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 17:12:07 +0800
Subject: [PATCH] 工单巡查
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml | 151 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 129 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 4bd4454..5d02b54 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
@@ -26,9 +26,55 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <select id="getWorkOrderDetail" 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,
+ 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
+ where id = #{id}
+ </select>
+
<select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
- select * from ja_gd_work_order
+ 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
<where>
<if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
and work_order_status like concat(#{param2.workOrderStatus},'%')
@@ -39,14 +85,41 @@
<if test="param2.workOrderType != null and param2.workOrderType != ''">
and work_order_type = #{param2.workOrderType}
</if>
+ <if test="param2.createUser != null and param2.createUser != ''">
+ and 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}
+ </if>
+ and is_deleted = 0
</where>
</select>
<select id="exportGdWorkOrder" resultType="org.sxkj.gd.workorder.excel.GdWorkOrderExcel">
- SELECT *
+ 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,
+ geom,
+ remark,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
FROM ja_gd_work_order ${ew.customSqlSegment}
</select>
+
<!-- 自定义插入语句，使用ST_GeomFromText处理几何数据 -->
<insert id="insert" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
@@ -65,25 +138,59 @@
</insert>
<!-- 自定义更新语句，使用ST_GeomFromText处理几何数据 -->
- <update id="updateById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
- UPDATE ja_gd_work_order
- SET work_order_name = #{workOrderName},
- work_order_code = #{workOrderCode},
- work_order_type = #{workOrderType},
- device_load_demand = #{deviceLoadDemand},
- recommend_device_ids = #{recommendDeviceIds},
- work_order_status = #{workOrderStatus},
- execute_start_time = #{executeStartTime},
- execute_end_time = #{executeEndTime},
- service_party = #{serviceParty},
- geom = ST_GeomFromText(#{geom}),
- remark = #{remark},
- area_code = #{areaCode},
- update_user = #{updateUser},
- update_time = #{updateTime},
- status = #{status},
- is_deleted = #{isDeleted}
- WHERE id = #{id}
- </update>
+ <!-- <update id="updateById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity"> -->
+ <!-- UPDATE ja_gd_work_order -->
+ <!-- <set> -->
+ <!-- <if test="workOrderName != null and workOrderName != ''"> -->
+ <!-- work_order_name = #{workOrderName}, -->
+ <!-- </if> -->
+ <!-- <if test="workOrderCode != null and workOrderCode != ''"> -->
+ <!-- work_order_code = #{workOrderCode}, -->
+ <!-- </if> -->
+ <!-- <if test="workOrderType != null and workOrderType != ''"> -->
+ <!-- work_order_type = #{workOrderType}, -->
+ <!-- </if> -->
+ <!-- <if test="deviceLoadDemand != null and deviceLoadDemand != ''"> -->
+ <!-- device_load_demand = #{deviceLoadDemand}, -->
+ <!-- </if> -->
+ <!-- <if test="recommendDeviceIds != null and recommendDeviceIds != ''"> -->
+ <!-- recommend_device_ids = #{recommendDeviceIds}, -->
+ <!-- </if> -->
+ <!-- <if test="workOrderStatus != null"> -->
+ <!-- work_order_status = #{workOrderStatus}, -->
+ <!-- </if> -->
+ <!-- <if test="executeStartTime != null"> -->
+ <!-- execute_start_time = #{executeStartTime}, -->
+ <!-- </if> -->
+ <!-- <if test="executeEndTime != null"> -->
+ <!-- execute_end_time = #{executeEndTime}, -->
+ <!-- </if> -->
+ <!-- <if test="serviceParty != null and serviceParty != ''"> -->
+ <!-- service_party = #{serviceParty}, -->
+ <!-- </if> -->
+ <!-- <if test="geom != null and geom != ''"> -->
+ <!-- geom = ST_GeomFromText(#{geom}), -->
+ <!-- </if> -->
+ <!-- <if test="remark != null and remark != ''"> -->
+ <!-- remark = #{remark}, -->
+ <!-- </if> -->
+ <!-- <if test="areaCode != null and areaCode != ''"> -->
+ <!-- area_code = #{areaCode}, -->
+ <!-- </if> -->
+ <!-- <if test="updateUser != null"> -->
+ <!-- update_user = #{updateUser}, -->
+ <!-- </if> -->
+ <!-- <if test="updateTime != null"> -->
+ <!-- update_time = #{updateTime}, -->
+ <!-- </if> -->
+ <!-- <if test="status != null"> -->
+ <!-- status = #{status}, -->
+ <!-- </if> -->
+ <!-- <if test="isDeleted != null"> -->
+ <!-- is_deleted = #{isDeleted}, -->
+ <!-- </if> -->
+ <!-- </set> -->
+ <!-- WHERE id = #{id} -->
+ <!-- </update> -->
</mapper>
--
Gitblit v1.9.3