From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 155 insertions(+), 17 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 d2eb888..433493d 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;
@@ -72,10 +74,97 @@
@Override
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, keyword);
+ // 1. 获取当前用户部门ID和用户ID
+ Long deptId = null;
+ Long userId = null;
+ Integer mine = 0;
+ List<Integer> statusList;
+
+ // 2. 判断是否为管理员
+ boolean isAdmin = AuthUtil.isAdministrator() || AuthUtil.isAdmin();
+
+ if (!isAdmin) {
+ // 非管理员：获取部门ID和用户ID
+ deptId = Long.valueOf(AuthUtil.getDeptId());
+ userId = AuthUtil.getUserId();
+ mine = onlyMine == null ? 0 : onlyMine;
+ // 非管理员：排除已退回状态（状态2）
+ statusList = java.util.Arrays.asList(0, 1, 3, 4);
+ } else {
+ // 管理员：可以查询所有状态
+ statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
+ }
+
+ // 3. 查询事件列表
+ return baseMapper.selectGdClueEventSimpleList(deptId, userId, mine, keyword, statusList);
+ }
+
+ /**
+ * 列表查询（分页）
+ * <p>
+ * 步骤：
+ * 1. 获取当前用户部门ID和用户ID
+ * 2. 判断是否为管理员，设置状态列表
+ * 3. 根据includeReturned参数决定是否包含已退回状态
+ * 4. 根据事件状态参数调整状态列表
+ * 5. 查询分页数据
+ * </p>
+ *
+ * @param page 分页对象
+ * @param onlyMine 是否仅我的数据
+ * @param keyword 事件编号关键字
+ * @param eventStatus 事件状态
+ * @param startTime 开始时间
+ * @param endTime 结束时间
+ * @param includeReturned 是否包含已退回数据，1为是，0为否
+ * @return 分页数据
+ */
+ @Override
+ public IPage<GdClueEventListVO> pageGdClueEventByDept(IPage<GdClueEventListVO> page, Integer onlyMine, String keyword,
+ Integer eventStatus, String startTime, String endTime, Integer includeReturned) {
+ // 1. 获取当前用户部门ID和用户ID
+ Long deptId = null;
+ Long userId = null;
+ Integer mine = 0;
+ List<Integer> statusList;
+
+ // 2. 判断是否为管理员
+ boolean isAdmin = AuthUtil.isAdministrator() || AuthUtil.isAdmin();
+ mine = onlyMine == null ? 0 : onlyMine;
+ if (mine == 1) {
+ // 管理员：仅查询当前用户数据
+ userId = AuthUtil.getUserId();
+ }
+
+ // 3. 根据includeReturned参数构建状态列表
+ boolean shouldIncludeReturned = includeReturned != null && includeReturned == 1;
+ if (!isAdmin) {
+ // 非管理员：获取部门ID
+ deptId = Long.valueOf(AuthUtil.getDeptId());
+ // 非管理员：根据includeReturned参数决定是否包含已退回状态（状态2）
+ statusList = java.util.Arrays.asList(0, 1, 3, 4);
+ } else {
+ // 管理员：根据includeReturned参数决定是否包含已退回状态
+ if (shouldIncludeReturned) {
+ statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
+ } else {
+ statusList = java.util.Arrays.asList(0, 1, 3, 4);
+ }
+ }
+
+ // 4. 如果指定了事件状态，优先使用指定的状态
+ if (eventStatus != null) {
+ // 检查指定的状态是否在允许的状态列表中
+ if (statusList.contains(eventStatus)) {
+ statusList = java.util.Arrays.asList(eventStatus);
+ } else {
+ // 如果指定的状态不在允许列表中，返回空结果
+ statusList = java.util.Collections.emptyList();
+ }
+ }
+
+ // 5. 查询分页数据
+ return page.setRecords(baseMapper.selectGdClueEventSimpleList(page, deptId, userId, mine, keyword, statusList, startTime, endTime));
}
@Override
@@ -83,7 +172,7 @@
if (id == null) {
throw new RuntimeException("事件ID不能为空");
}
- Long deptId = Long.valueOf(AuthUtil.getDeptId());
+ Long deptId = null; //Long.valueOf(AuthUtil.getDeptId());
GdClueEventVO detail = baseMapper.selectGdClueEventDetailById(id, deptId);
if (detail == null) {
throw new RuntimeException("事件不存在");
@@ -99,24 +188,38 @@
@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();
- // 2. 查询统计数据
- GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId, keyword);
+ if (isAdmin) {
+ // 管理员：可以查询所有状态
+ userId = AuthUtil.getUserId();
+ statusList = java.util.Arrays.asList(0, 1, 3, 4);
+ } else {
+ deptId = Long.valueOf(AuthUtil.getDeptId());
+ userId = AuthUtil.getUserId();
+ // 非管理员：排除已退回状态（状态2）
+ statusList = java.util.Arrays.asList(0, 1, 3, 4);
+ }
- // 3. 处理空结果，返回默认值
+ // 3. 查询统计数据
+ GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId, keyword, statusList);
+
+ // 4. 处理空结果，返回默认值
if (countVO == null) {
GdClueEventCountVO empty = new GdClueEventCountVO();
empty.setTotalCount(0L);
empty.setMyCount(0L);
- empty.setReturnedCount(0L);
+ empty.setDisposingCount(0L);
empty.setDisposedCount(0L);
empty.setCompletedCount(0L);
return empty;
}
- // 4. 返回统计结果
+ // 5. 返回统计结果
return countVO;
}
@@ -127,17 +230,27 @@
if (taskResult == null || (taskResult.getIsDeleted() != null && taskResult.getIsDeleted() != 0)) {
throw new RuntimeException("成果不存在");
}
- if (taskResult.getDistributeStatus() != null && taskResult.getDistributeStatus() == 1) {
+ // 判断是否已分发，只有"已退回(2)"和"待确认(0)"状态才允许分发，其他状态均不能分发
+ if (!EventStatusEnum.RETURNED.getCode().equals(taskResult.getDistributeStatus())
+ && !EventStatusEnum.PENDING_CONFIRM.getCode().equals(taskResult.getDistributeStatus())) {
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.setWorkOrderId(taskResult.getPatrolTaskId());
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);
@@ -150,9 +263,17 @@
clueEvent.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
clueEvent.setCreateTime(new Date());
clueEvent.setEventName(distributeParam.getEventName());
- if (!save(clueEvent)) {
+ if (!saveOrUpdate(clueEvent)) {
throw new RuntimeException("事件分发失败");
}
+ // 插入状态流转记录（从无到待确认）
+ gdClueEventStatusFlowService.insertStatusFlow(
+ clueEvent.getId(),
+ null,
+ EventStatusEnum.PENDING_CONFIRM.getCode(),
+ "事件分发",
+ new Date()
+ );
taskResult.setDistributeStatus(1);
taskResult.setUpdateUser(AuthUtil.getUserId());
taskResult.setUpdateTime(new Date());
@@ -240,10 +361,12 @@
* 3. 校验状态流转合法性
* 4. 更新事件状态
* 5. 插入状态流转记录
+ * 6. 退回时同步更新成果状态
* </p>
*
* @param updateParam 状态更新参数
* @return 是否操作成功
+ * @throws RuntimeException 当参数为空、事件不存在、状态流转非法或更新失败时抛出
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -293,6 +416,21 @@
updateParam.getOperateTime() != null ? updateParam.getOperateTime() : new Date()
);
+ // 6. 退回时同步更新成果状态
+ if (targetStatus.equals(EventStatusEnum.RETURNED.getCode())) {
+ // 查询成果信息
+ GdTaskResultEntity taskResult = gdTaskResultService.getById(eventEntity.getResultId());
+ if (taskResult != null && (taskResult.getIsDeleted() == null || taskResult.getIsDeleted() == 0)) {
+ // 更新成果分发状态为已退回（状态2）
+ taskResult.setDistributeStatus(EventStatusEnum.RETURNED.getCode());
+ taskResult.setUpdateUser(AuthUtil.getUserId());
+ taskResult.setUpdateTime(new Date());
+ if (!gdTaskResultService.updateTaskResultById(taskResult)) {
+ throw new RuntimeException("成果状态更新失败");
+ }
+ }
+ }
+
return true;
}
--
Gitblit v1.9.3