feat(workorder): 添加管理员仅查询当前用户数据功能

linwei

3 days ago 650dedbec381da234d9a81f03afbb3a0ef4ff9e0

 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;
@@ -135,6 +137,10 @@
         // 非管理员：排除已退回状态（状态2）
         statusList = java.util.Arrays.asList(0, 1, 3, 4);
      } else {
         if (onlyMine != null && onlyMine == 1) {
            // 管理员：仅查询当前用户数据
            userId = AuthUtil.getUserId();
         }
         // 管理员：可以查询所有状态
         statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
      }
@@ -159,7 +165,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("事件不存在");
@@ -175,10 +181,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 +191,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);
      }
@@ -198,7 +205,7 @@
         GdClueEventCountVO empty = new GdClueEventCountVO();
         empty.setTotalCount(0L);
         empty.setMyCount(0L);
         empty.setReturnedCount(0L);
         empty.setDisposingCount(0L);
         empty.setDisposedCount(0L);
         empty.setCompletedCount(0L);
         return empty;
@@ -215,17 +222,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);
@@ -238,9 +255,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());
@@ -328,10 +353,12 @@
    * 3. 校验状态流转合法性
    * 4. 更新事件状态
    * 5. 插入状态流转记录
    * 6. 退回时同步更新成果状态
    * </p>
    *
    * @param updateParam 状态更新参数
    * @return 是否操作成功
    * @throws RuntimeException 当参数为空、事件不存在、状态流转非法或更新失败时抛出
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -381,6 +408,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;
   }