From 0772aaa85b37435ef04cd537c83fcab4e26991f1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 09:16:50 +0800
Subject: [PATCH] 工单查询
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java | 3
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java | 2
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java | 7 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java | 7 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml | 77 ++++++++++++++-----------
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 7 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java | 28 +++++++++
7 files changed, 86 insertions(+), 45 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
index cdd1285..cf4ad84 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
@@ -32,7 +32,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -79,7 +80,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdWorkOrder")
- public R<IPage<GdWorkOrderVO>> page(GdWorkOrderVO gdWorkOrder, Query query) {
+ public R<IPage<GdWorkOrderVO>> page(WorkOrderPageParam gdWorkOrder, Query query) {
IPage<GdWorkOrderVO> pages = gdWorkOrderService.selectGdWorkOrderPage(Condition.getPage(query), gdWorkOrder);
return R.data(pages);
}
@@ -90,7 +91,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdWorkOrder")
- public R save(@Valid @RequestBody WorkOrderParam workOrderParam) {
+ public R save(@Valid @RequestBody WorkOrderAddParam workOrderParam) {
return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
}
//
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java
index 014708a..8bd6ea4 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java
@@ -17,6 +17,7 @@
package org.sxkj.gd.workorder.mapper;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@
* @param gdWorkOrder
* @return
*/
- List<GdWorkOrderVO> selectGdWorkOrderPage(IPage page, GdWorkOrderVO gdWorkOrder);
+ List<GdWorkOrderVO> selectGdWorkOrderPage(IPage page, WorkOrderPageParam gdWorkOrder);
/**
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 0856fdd..4bd4454 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
@@ -28,52 +28,61 @@
<select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
- select * from ja_gd_work_order where is_deleted = 0
+ select * from ja_gd_work_order
+ <where>
+ <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
+ and work_order_status like concat(#{param2.workOrderStatus},'%')
+ </if>
+ <if test="param2.workOrderName != null and param2.workOrderName != ''">
+ and work_order_name like concat('%',#{param2.workOrderName},'%')
+ </if>
+ <if test="param2.workOrderType != null and param2.workOrderType != ''">
+ and work_order_type = #{param2.workOrderType}
+ </if>
+ </where>
</select>
<select id="exportGdWorkOrder" resultType="org.sxkj.gd.workorder.excel.GdWorkOrderExcel">
- SELECT * FROM ja_gd_work_order ${ew.customSqlSegment}
+ SELECT *
+ 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,
- 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}
- )
+ INSERT INTO ja_gd_work_order (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)
+ VALUES (#{id}, #{workOrderName}, #{workOrderCode}, #{workOrderType},
+ #{deviceLoadDemand}, #{recommendDeviceIds}, #{workOrderStatus},
+ #{executeStartTime}, #{executeEndTime}, #{serviceParty},
+ ST_GeomFromText(#{geom}), #{remark}, #{areaCode},
+ #{createUser}, #{createDept}, #{createTime},
+ #{updateUser}, #{updateTime}, #{status}, #{isDeleted})
</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}
+ 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>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java
similarity index 98%
rename from drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderParam.java
rename to drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java
index 5f2bdf0..e3223ed 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderParam.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java
@@ -8,7 +8,7 @@
import java.util.Date;
@Data
-public class WorkOrderParam {
+public class WorkOrderAddParam {
@ApiModelProperty(value = "id")
private Long id;
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java
new file mode 100644
index 0000000..218fd13
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java
@@ -0,0 +1,28 @@
+package org.sxkj.gd.workorder.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WorkOrderPageParam {
+
+ /**
+ * 工单名称
+ */
+ @ApiModelProperty(value = "工单名称")
+ @NotNull
+ private String workOrderName;
+
+ /**
+ * 工单类型（巡查类/安检类等）
+ */
+ @ApiModelProperty(value = "工单类型（1.巡查类/2.安检类等）")
+ @NotNull
+ private String workOrderType;
+
+ @ApiModelProperty(value = "工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算")
+ @NotNull
+ private String workOrderStatus;
+}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java
index bfd7d50..54c1b5e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java
@@ -18,7 +18,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -42,7 +43,7 @@
* @param gdWorkOrder
* @return
*/
- IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, GdWorkOrderVO gdWorkOrder);
+ IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder);
/**
@@ -58,7 +59,7 @@
* @param workOrderParam
* @return
*/
- boolean saveWorkOrder(@Valid WorkOrderParam workOrderParam);
+ boolean saveWorkOrder(@Valid WorkOrderAddParam workOrderParam);
/**
* 处理工单状态变更（接单或拒接接单）
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
index 26e0092..a9f098b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -35,7 +35,8 @@
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
import org.sxkj.gd.workorder.mapper.GdWorkOrderMapper;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
@@ -58,7 +59,7 @@
private IGdWorkOrderFlowService gdWorkOrderFlowService;
@Override
- public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, GdWorkOrderVO gdWorkOrder) {
+ public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
}
@@ -79,7 +80,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveWorkOrder(WorkOrderParam workOrderParam) {
+ public boolean saveWorkOrder(WorkOrderAddParam workOrderParam) {
GdWorkOrderEntity entity = Objects.requireNonNull(BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class));
// 验证并格式化几何数据
--
Gitblit v1.9.3