From c929056185b25dc2e36a43a8afc8305cc37bb3ac Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 31 Jul 2026 14:02:41 +0800
Subject: [PATCH] feat(workorder): 添加事件状态时间线功能
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
index 0f778be..f7ff16e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
@@ -218,10 +218,12 @@
if (taskResult == null || (taskResult.getIsDeleted() != null && taskResult.getIsDeleted() != 0)) {
throw new RuntimeException("成果不存在");
}
- // 判断是否已分发, 不为空，并且不能是退回状态，则不能分发
- if (taskResult.getDistributeStatus() != null && !EventStatusEnum.RETURNED.getCode().equals(taskResult.getDistributeStatus())) {
+ // 判断是否已分发，只有"已退回(2)"和"待确认(0)"状态才允许分发，其他状态均不能分发
+ if (!EventStatusEnum.RETURNED.getCode().equals(taskResult.getDistributeStatus())
+ && !EventStatusEnum.PENDING_CONFIRM.getCode().equals(taskResult.getDistributeStatus())) {
throw new RuntimeException("成果已分发，无法再次分发");
}
+
// 查看事件直接是否分发过
GdClueEventEntity clueEvent = getOne(Wrappers.<GdClueEventEntity>query().lambda()
.eq(GdClueEventEntity::getResultId, distributeParam.getResultId())
@@ -231,7 +233,7 @@
clueEvent = new GdClueEventEntity();
}
clueEvent.setResultId(distributeParam.getResultId());
- clueEvent.setWorkOrderId(distributeParam.getWorkOrderId());
+ clueEvent.setWorkOrderId(taskResult.getPatrolTaskId());
clueEvent.setDisposeUser(distributeParam.getDisposeUser());
clueEvent.setDisposeDept(distributeParam.getDisposeDept());
clueEvent.setLongitude(distributeParam.getLongitude());
--
Gitblit v1.9.3