From f247e3eef107985b6dc7d2bc04803235570b15a7 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 15:57:49 +0800
Subject: [PATCH] 事件分发时新增事件编号，事件详情新增编号模糊查询
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 dbf21b8..556b747 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
@@ -21,6 +21,8 @@
import lombok.AllArgsConstructor;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.common.constant.WordOrderConstant;
+import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.workorder.entity.GdClueEventEntity;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.excel.GdClueEventExcel;
@@ -63,11 +65,11 @@
}
@Override
- public List<GdClueEventListVO> listGdClueEventByDept(Integer onlyMine) {
+ public List<GdClueEventListVO> listGdClueEventByDept(Integer onlyMine, String keyword) {
Long deptId = Long.valueOf(AuthUtil.getDeptId());
Long userId = AuthUtil.getUserId();
Integer mine = onlyMine == null ? 0 : onlyMine;
- return baseMapper.selectGdClueEventSimpleList(deptId, userId, mine);
+ return baseMapper.selectGdClueEventSimpleList(deptId, userId, mine, keyword);
}
@Override
@@ -88,10 +90,10 @@
}
@Override
- public GdClueEventCountVO getGdClueEventCount() {
+ public GdClueEventCountVO getGdClueEventCount(String keyword) {
Long deptId = Long.valueOf(AuthUtil.getDeptId());
Long userId = AuthUtil.getUserId();
- GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId);
+ GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId, keyword);
if (countVO == null) {
GdClueEventCountVO empty = new GdClueEventCountVO();
empty.setTotalCount(0L);
@@ -119,6 +121,9 @@
clueEvent.setLongitude(distributeParam.getLongitude());
clueEvent.setLatitude(distributeParam.getLatitude());
clueEvent.setEventStatus(1);
+ String times = OrderNumUtils.initOrderNum(WordOrderConstant.EVENT_NUM_KEY);
+ String eventNum = WordOrderConstant.EVENT_NUM_PREFIX + times;
+ clueEvent.setEventNum(eventNum);
if (StringUtil.isBlank(distributeParam.getAreaCode())) {
clueEvent.setAreaCode(taskResult.getAreaCode());
} else {
@@ -141,25 +146,30 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean rejectClueEvent(GdClueEventRejectParam rejectParam) {
+ public boolean handleClueEvent(GdClueEventRejectParam rejectParam) {
GdClueEventEntity clueEvent = getById(rejectParam.getEventId());
if (clueEvent == null || (clueEvent.getIsDeleted() != null && clueEvent.getIsDeleted() != 0)) {
throw new RuntimeException("事件不存在");
}
if (clueEvent.getEventStatus() == null || clueEvent.getEventStatus() != 1) {
- throw new RuntimeException("事件当前状态无法驳回");
+ throw new RuntimeException("事件当前状态无法处理");
}
- clueEvent.setEventStatus(2);
+ Integer operateStatus = rejectParam.getEventStatus();
+ if (operateStatus == null || (operateStatus != 0 && operateStatus != 1)) {
+ throw new RuntimeException("事件状态不正确");
+ }
+ int targetStatus = operateStatus == 0 ? 2 : 3;
+ clueEvent.setEventStatus(targetStatus);
clueEvent.setUpdateUser(AuthUtil.getUserId());
clueEvent.setUpdateTime(new Date());
if (!updateById(clueEvent)) {
- throw new RuntimeException("事件驳回失败");
+ throw new RuntimeException("事件处理失败");
}
GdTaskResultEntity taskResult = gdTaskResultService.getById(clueEvent.getResultId());
if (taskResult == null || (taskResult.getIsDeleted() != null && taskResult.getIsDeleted() != 0)) {
throw new RuntimeException("成果不存在");
}
- taskResult.setDistributeStatus(2);
+ taskResult.setDistributeStatus(targetStatus);
taskResult.setUpdateUser(AuthUtil.getUserId());
taskResult.setUpdateTime(new Date());
if (!gdTaskResultService.updateById(taskResult)) {
--
Gitblit v1.9.3