From 3ba4841f2f11d4fcadb78a4891595e9368323571 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 19:00:47 +0800
Subject: [PATCH] fix(task): 修复任务更新日志和工单流转处理
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 ce46f2e..cf3afad 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
@@ -24,6 +24,7 @@
import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -42,6 +43,7 @@
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskUpdateParam;
+import org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.wrapper.GdPatrolTaskWrapper;
@@ -62,6 +64,7 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("workOrder/gdPatrolTask")
@@ -149,17 +152,28 @@
/**
* 巡查任务执行完成-对外
+ * 根据执行结果设置不同状态：
+ * - 执行成功(success=true或不传): 状态设置为待验收(PENDING_ACCEPTANCE)
+ * - 执行失败(success=false): 状态设置为待签收(PENDING_SIGNING)
*/
@PostMapping("/auditExternal")
@ApiOperationSupport(order = 11)
- @ApiOperation(value = "巡查任务执行完成-对外", notes = "只能使用执行完成操作")
+ @ApiOperation(value = "巡查任务执行完成-对外", notes = "根据执行结果设置不同状态，不传success默认为成功")
public R auditExternal(@Valid @RequestBody IdParam param) {
+ log.info("巡查任务执行完成-对外:{}", param);
if (param.getId() == null) {
return R.fail("巡检任务id不能为空");
}
GdPatrolTaskEntity auditParam = new GdPatrolTaskEntity();
auditParam.setId(param.getId());
- auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
+ // 根据执行结果设置不同状态，不传success默认为成功
+ if (param.getSuccess() == null || Boolean.TRUE.equals(param.getSuccess())) {
+ // 执行成功（或不传），设置为待验收状态
+ auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
+ } else {
+ // 执行失败，设置为待签收状态
+ auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_SIGNING.getValue());
+ }
return R.status(gdPatrolTaskService.updatePatrolTaskById(auditParam));
}
@@ -221,4 +235,18 @@
return R.data(cacheData);
}
+ /**
+ * 根据工单ID查询巡查任务列表（仅返回id和名称）
+ */
+ @GetMapping("/listByWorkOrderId")
+ @ApiOperationSupport(order = 17)
+ @ApiOperation(value = "根据工单ID查询巡查任务列表", notes = "传入工单ID")
+ public R<List<GdPatrolTaskSimpleVO>> listByWorkOrderId(@ApiParam(value = "工单ID", required = true) @RequestParam Long workOrderId) {
+ if (workOrderId == null) {
+ return R.fail("工单ID不能为空");
+ }
+ List<GdPatrolTaskSimpleVO> list = gdPatrolTaskService.selectListByWorkOrderId(workOrderId);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3