吉安感知网项目-后端
linwei
5 days ago a86f51ae6319bbc1a6206e5c2e3f8c65eaf17217
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
@@ -218,7 +218,8 @@
      if (taskResult == null || (taskResult.getIsDeleted() != null && taskResult.getIsDeleted() != 0)) {
         throw new RuntimeException("成果不存在");
      }
      if (taskResult.getDistributeStatus() != null && taskResult.getDistributeStatus() == 1) {
      // 判断是否已分发, 不为空,并且不能是退回状态,则不能分发
      if (taskResult.getDistributeStatus() != null && !EventStatusEnum.RETURNED.getCode().equals(taskResult.getDistributeStatus())) {
         throw new RuntimeException("成果已分发,无法再次分发");
      }
      // 查看事件直接是否分发过
@@ -251,6 +252,14 @@
      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());
@@ -338,10 +347,12 @@
    * 3. 校验状态流转合法性
    * 4. 更新事件状态
    * 5. 插入状态流转记录
    * 6. 退回时同步更新成果状态
    * </p>
    *
    * @param updateParam 状态更新参数
    * @return 是否操作成功
    * @throws RuntimeException 当参数为空、事件不存在、状态流转非法或更新失败时抛出
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -391,6 +402,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;
   }