工单优化

linwei

2026-02-04 8a116ffbb7e4e6af1502a841b811b8108cdeb359

工单优化

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java

@@ -162,7 +162,7 @@
        GdPatrolTaskEntity auditParam = new GdPatrolTaskEntity();
        auditParam.setId(param.getId());
        auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
        return R.status(gdPatrolTaskService.updateById(auditParam));
        return R.status(gdPatrolTaskService.updatePatrolTaskById(auditParam));
    }

    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.AllArgsConstructor;
import lombok.Getter;

/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java

@@ -74,4 +74,12 @@
     * @return
     */
    GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity);

    /**
     *
     * @param id
     * @param code
     * @return
     */
    GdWorkOrderEntity getWorkOrderIdById(Long id, String code);
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml

@@ -114,6 +114,15 @@
        WHERE pt.id = #{id}
    </select>

    <select id="getWorkOrderIdById" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        SELECT
            *
        FROM
            ja_gd_work_order
        WHERE id = #{id}
          AND work_order_status = #{code}
    </select>

    <!-- 自定义更新工单状态语句 -->
    <update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        UPDATE ja_gd_work_order

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java

@@ -96,4 +96,11 @@
     * @return
     */
    GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity);

    /**
     *
     * @param auditParam
     * @return
     */
    boolean updatePatrolTaskById(GdPatrolTaskEntity auditParam);
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -480,7 +480,6 @@
    }



    /**
     * 根据部门ID获取部门名称
     *
@@ -672,20 +671,6 @@
        }
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirportId())) {
            param.setAirportId(gdPatrolTaskVO.getAirportId());
            // GdManageDeviceEntity device = null;
            // if (StringUtils.isNumeric(taskEntity.getAirportId())) {
            //     device = gdManageDeviceService.getById(Long.valueOf(taskEntity.getDeviceId()));
            // }
            // if (device == null) {
            //     device = gdManageDeviceService.lambdaQuery()
            //         .eq(GdManageDeviceEntity::getAirportId, taskEntity.getDeviceId())
            //         .one();
            // }
            // if (device != null && StringUtil.isNotBlank(device.getAirportId())) {
            //     param.setAirportId(device.getAirportId());
            // } else {
            //     param.setAirportId(taskEntity.getAirportId());
            // }
        }
        param.setStatus("待执行");
        param.setTaskType("航线飞行");
@@ -696,4 +681,18 @@
    public GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity) {
        return baseMapper.getPatrolTaskDetail(gdPatrolTaskEntity);
    }

    @Override
    public boolean updatePatrolTaskById(GdPatrolTaskEntity auditParam) {
        GdPatrolTaskEntity patrolTaskEntity = getById(auditParam.getId());
        // 保存巡查工单流转
        saveWorkOrderFlow(patrolTaskEntity.getWorkOrderId(), PatrolTaskStatusEnum.PENDING_ACCEPTANCE, null, null);
        // 保存工单流转
        GdWorkOrderEntity workOrderEntity = baseMapper.getWorkOrderIdById(auditParam.getId(), WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
        // 工单流转
        if (workOrderEntity == null) {
            updateWorkOrderStatusAndFlow(patrolTaskEntity.getWorkOrderId(), WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
        }
        return updateById(auditParam);
    }
}