From 62b9b28b6ce8e51f797d77c4351d432aabdab2c1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 30 Jul 2026 09:09:32 +0800
Subject: [PATCH] fix(workorder): 修复线索事件重复分发问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 f5a7bfa..2641a10 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
@@ -17,7 +17,9 @@
package org.sxkj.gd.workorder.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.utils.AuthUtil;
@@ -175,10 +177,9 @@
@Override
public GdClueEventCountVO getGdClueEventCount(String keyword) {
// 1. 获取当前用户部门ID和用户ID
- Long deptId = Long.valueOf(AuthUtil.getDeptId());
- Long userId = AuthUtil.getUserId();
List<Integer> statusList;
-
+ Long deptId = null;
+ Long userId = null;
// 2. 判断是否为管理员
boolean isAdmin = AuthUtil.isAdministrator() || AuthUtil.isAdmin();
@@ -186,6 +187,8 @@
// 管理员：可以查询所有状态
statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
} else {
+ deptId = Long.valueOf(AuthUtil.getDeptId());
+ userId = AuthUtil.getUserId();
// 非管理员：排除已退回状态（状态2）
statusList = java.util.Arrays.asList(0, 1, 3, 4);
}
@@ -218,14 +221,21 @@
if (taskResult.getDistributeStatus() != null && taskResult.getDistributeStatus() == 1) {
throw new RuntimeException("成果已分发，无法再次分发");
}
- GdClueEventEntity clueEvent = new GdClueEventEntity();
+ // 查看事件直接是否分发过
+ GdClueEventEntity clueEvent = getOne(Wrappers.<GdClueEventEntity>query().lambda()
+ .eq(GdClueEventEntity::getResultId, distributeParam.getResultId())
+ .eq(GdClueEventEntity::getIsDeleted, 0));
+ // 如果是空的则创建对象
+ if (clueEvent == null) {
+ clueEvent = new GdClueEventEntity();
+ }
clueEvent.setResultId(distributeParam.getResultId());
clueEvent.setWorkOrderId(distributeParam.getWorkOrderId());
clueEvent.setDisposeUser(distributeParam.getDisposeUser());
clueEvent.setDisposeDept(distributeParam.getDisposeDept());
clueEvent.setLongitude(distributeParam.getLongitude());
clueEvent.setLatitude(distributeParam.getLatitude());
- clueEvent.setEventStatus(1);
+ clueEvent.setEventStatus(EventStatusEnum.PENDING_CONFIRM.getCode());
String times = OrderNumUtils.initOrderNum(WordOrderConstant.EVENT_NUM_KEY);
String eventNum = WordOrderConstant.EVENT_NUM_PREFIX + times;
clueEvent.setEventNum(eventNum);
@@ -238,7 +248,7 @@
clueEvent.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
clueEvent.setCreateTime(new Date());
clueEvent.setEventName(distributeParam.getEventName());
- if (!save(clueEvent)) {
+ if (!saveOrUpdate(clueEvent)) {
throw new RuntimeException("事件分发失败");
}
taskResult.setDistributeStatus(1);
--
Gitblit v1.9.3