From 99eb7fcdf24d7284576c9558c57b9cab0106da62 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 14:26:04 +0800
Subject: [PATCH] 工单调整

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index 90bbb52..890e4f5 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -27,6 +27,8 @@
 import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
 import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
 import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
+import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
+import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
 import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
 import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
 import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
@@ -53,7 +55,7 @@
 	private IGdWorkOrderFlowService gdWorkOrderFlowService;
 
 	@Override
-	public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask) {
+	public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
 		return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
 	}
 
@@ -108,7 +110,10 @@
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean auditPatrolTask(Long id, String auditStatus, String rejectReason) {
+	public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
+		Long id = auditParam.getId();
+		String auditStatus = auditParam.getAuditStatus();
+		String rejectReason = auditParam.getRejectReason();
 		// 1. 获取巡查任务
 		GdPatrolTaskEntity task = getById(id);
 		if (task == null) {
@@ -131,7 +136,7 @@
 		}
 
 		// 4. 更新任务状态
-		task.setTaskStatus(Byte.valueOf(auditStatus));
+		task.setTaskStatus(auditStatus);
 		boolean updateResult = updateById(task);
 		if (!updateResult) {
 			throw new RuntimeException("更新任务状态失败");

--
Gitblit v1.9.3