From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
index a18f921..c5c8ed5 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
@@ -79,8 +79,8 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdPatrolTask")
public R<GdPatrolTaskVO> detail(GdPatrolTaskEntity gdPatrolTask) {
- GdPatrolTaskEntity detail = gdPatrolTaskService.getOne(Condition.getQueryWrapper(gdPatrolTask));
- return R.data(GdPatrolTaskWrapper.build().entityVO(detail));
+ GdPatrolTaskVO detail = gdPatrolTaskService.getPatrolTaskDetail(gdPatrolTask);
+ return R.data(detail);
}
/**
@@ -162,7 +162,7 @@
GdPatrolTaskEntity auditParam = new GdPatrolTaskEntity();
auditParam.setId(param.getId());
auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
- return R.status(gdPatrolTaskService.updateById(auditParam));
+ return R.status(gdPatrolTaskService.updatePatrolTaskById(auditParam));
}
/**
--
Gitblit v1.9.3