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 | 229 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 172 insertions(+), 57 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 887c599..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
@@ -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"/>
@@ -26,91 +26,206 @@
<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,
+ 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="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
- 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>
+ and wo.is_deleted = 0
<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 wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
+ </if>
+ <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>
<select id="exportGdWorkOrder" resultType="org.sxkj.gd.workorder.excel.GdWorkOrderExcel">
- 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
+ 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">
- INSERT INTO ja_gd_work_order (id, work_order_name, work_order_code, work_order_type,
+ <insert id="saveWorkOrder" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ INSERT INTO ja_gd_work_order ( 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)
- VALUES (#{id}, #{workOrderName}, #{workOrderCode}, #{workOrderType},
- #{deviceLoadDemand}, #{recommendDeviceIds}, #{workOrderStatus},
- #{executeStartTime}, #{executeEndTime}, #{serviceParty},
- ST_GeomFromText(#{geom}), #{remark}, #{areaCode},
- #{createUser}, #{createDept}, #{createTime},
- #{updateUser}, #{updateTime}, #{status}, #{isDeleted})
+ VALUES ( #{workOrderParam.workOrderName}, #{workOrderParam.workOrderCode}, #{workOrderParam.workOrderType},
+ #{workOrderParam.deviceLoadDemand}, #{workOrderParam.recommendDeviceIds}, #{workOrderParam.workOrderStatus},
+ #{workOrderParam.executeStartTime}, #{workOrderParam.executeEndTime}, #{workOrderParam.serviceParty},
+ ST_GeomFromText(#{workOrderParam.geom}), #{workOrderParam.remark}, #{workOrderParam.areaCode},
+ #{workOrderParam.createUser}, #{workOrderParam.createDept}, #{workOrderParam.createTime},
+ #{workOrderParam.updateUser}, #{workOrderParam.updateTime}, #{workOrderParam.status}, #{workOrderParam.isDeleted})
</insert>
<!-- 自定义更新语句，使用ST_GeomFromText处理几何数据 -->
- <update id="updateById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ <update id="updateWorkOrderById" 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}
+ <set>
+ <if test="workOrderParam.workOrderName != null and workOrderParam.workOrderName != ''">
+ work_order_name = #{workOrderParam.workOrderName},
+ </if>
+ <if test="workOrderParam.workOrderCode != null and workOrderParam.workOrderCode != ''">
+ work_order_code = #{workOrderParam.workOrderCode},
+ </if>
+ <if test="workOrderParam.workOrderType != null and workOrderParam.workOrderType != ''">
+ work_order_type = #{workOrderParam.workOrderType},
+ </if>
+ <if test="workOrderParam.deviceLoadDemand != null and workOrderParam.deviceLoadDemand != ''">
+ device_load_demand = #{workOrderParam.deviceLoadDemand},
+ </if>
+ <if test="workOrderParam.recommendDeviceIds != null and workOrderParam.recommendDeviceIds != ''">
+ recommend_device_ids = #{workOrderParam.recommendDeviceIds},
+ </if>
+ <if test="workOrderParam.workOrderStatus != null">
+ work_order_status = #{workOrderParam.workOrderStatus},
+ </if>
+ <if test="workOrderParam.executeStartTime != null">
+ execute_start_time = #{workOrderParam.executeStartTime},
+ </if>
+ <if test="workOrderParam.executeEndTime != null">
+ execute_end_time = #{workOrderParam.executeEndTime},
+ </if>
+ <if test="workOrderParam.serviceParty != null and workOrderParam.serviceParty != ''">
+ service_party = #{workOrderParam.serviceParty},
+ </if>
+ <if test="workOrderParam.geom != null and workOrderParam.geom != ''">
+ geom = ST_GeomFromText(#{workOrderParam.geom}),
+ </if>
+ <if test="workOrderParam.remark != null and workOrderParam.remark != ''">
+ remark = #{workOrderParam.remark},
+ </if>
+ <if test="workOrderParam.areaCode != null and workOrderParam.areaCode != ''">
+ area_code = #{workOrderParam.areaCode},
+ </if>
+ <if test="workOrderParam.updateUser != null">
+ update_user = #{workOrderParam.updateUser},
+ </if>
+ <if test="workOrderParam.updateTime != null">
+ update_time = #{workOrderParam.updateTime},
+ </if>
+ <if test="workOrderParam.status != null">
+ status = #{workOrderParam.status},
+ </if>
+ <if test="workOrderParam.isDeleted != null">
+ is_deleted = #{workOrderParam.isDeleted},
+ </if>
+ </set>
+ WHERE id = #{workOrderParam.id}
</update>
</mapper>
--
Gitblit v1.9.3