吉安感知网项目-后端
linwei
2026-04-23 3bd2a7c41472d2418e427e013ef403fd1cc370d4
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -98,14 +98,13 @@
   @Override
   public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
      List<Long> deptList = new ArrayList<>();
      if (!AuthUtil.isAdministrator()) {
      if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
         deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      }
      gdPatrolTask.setDeptList(deptList);
      List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
      return page.setRecords(gdPatrolTaskVOS);
   }
   @Override
   public List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper) {
@@ -121,6 +120,8 @@
   public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
      // 更新流程节点
      for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
         // 设置航线ID
         gdPatrolTaskEntity.setAirlineId(gdPatrolTaskEntity.getPatrolRouteUrl());
         // 生成巡查任务编号
         if (StringUtils.isBlank(gdPatrolTaskEntity.getTaskNo())) {
            // 使用时间戳生成唯一巡查任务编号
@@ -468,14 +469,14 @@
   private boolean saveWorkOrderFlow(Long workOrderId, PatrolTaskStatusEnum newStatus,
                             String rejectReason, String areaCode) {
      GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
      flowEntity.setCreateUser(AuthUtil.getUserId());
      flowEntity.setCreateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
      flowEntity.setWorkOrderId(workOrderId);
      flowEntity.setFlowName(newStatus.getStageDesc());
      flowEntity.setFlowDesc(newStatus.getStageDesc());
      flowEntity.setOperator(AuthUtil.getNickName());
      flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
      flowEntity.setAreaCode(areaCode);
      flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
      flowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
      boolean saveResult = gdWorkOrderFlowService.save(flowEntity);
      if (!saveResult) {