fix(workflow): 修复工单流程阶段组装逻辑

linwei

2026-05-22 5f719f2ec586830847d85ec19754288f63006af8

fix(workflow): 修复工单流程阶段组装逻辑

- 移除冗余的遍历工单阶段注释
- 添加已取消状态判断逻辑，当工单已取消时不组装后续阶段
- 新增isCancellationState方法用于检查流程记录中的取消状态
- 在取消状态下直接返回结束阶段，避免显示无效的后续执行阶段

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

@@ -87,6 +87,11 @@
     */
    @ApiModelProperty(value = "设备飞手ID")
    private String deviceFlyerId;

    // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;

    /**
     * 关联设备ID
     */

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

@@ -61,6 +61,10 @@

    @ApiModelProperty("飞手id")
    private String deviceFlyerId;
     // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;



}

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

@@ -71,5 +71,9 @@
    @ApiModelProperty("飞手id")
    private String deviceFlyerId;

    // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;


}

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

@@ -681,6 +681,16 @@
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getDeviceFlyerId())) {
            param.setDeviceFlyerId(gdPatrolTaskVO.getDeviceFlyerId());
        }
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getAlgorithmIds())) {
            param.setAlgorithmId(gdPatrolTaskVO.getAlgorithmIds());
        }
        // 机构
        param.setDeptId(gdPatrolTaskVO.getCreateDept());
        // 巡检类型
        param.setInspectionTypeArr(Arrays.asList(gdPatrolTaskVO.getPatrolTaskType()));
        param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
        // 机巢名称
        param.setAirportName(gdPatrolTaskVO.getDeviceName());
        param.setStatus("待执行");
        param.setTaskType("定时飞行");
        return param;

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

@@ -153,4 +153,8 @@
    @ApiModelProperty(value = "纬度")
    private String latitude;

    // 算法 algorithmIds
    @ApiModelProperty("算法ids")
    private String algorithmIds;

}