From cdc60b89add7a32ee458c4b9c27acfdf40fc14fd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 20 Jan 2026 15:02:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 262c7e0..c333f90 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,7 @@
 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;
@@ -109,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) {

--
Gitblit v1.9.3