工单状态优化

linwei

2026-01-30 56540ae16621a5756fd66e414ec74ea09eba1531

工单状态优化

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

@@ -77,12 +77,12 @@
    /**
     * 响应中_拒绝取消
     */
    RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "拒绝取消"),
    // RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "拒绝取消"),

    /**
     * 响应中_拒绝修改
     */
    RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "拒绝修改"),
    // RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "拒绝修改"),

    /**
     * 执行中_待全部完成
@@ -233,12 +233,12 @@
            case RESPONDING_APPLY_MODIFY:
                // 响应中_申请修改状态允许：7同意修改，8不同意修改
                return operationType ==7 || operationType == 8 ;
            case RESPONDING_REJECT_CANCEL:
                // 响应中_拒绝取消状态允许：3申请取消
                return operationType == 3;
            case RESPONDING_REJECT_MODIFY:
                // 响应中_拒绝修改状态允许：4申请修改
                return operationType == 4 || operationType == 3;
            // case RESPONDING_REJECT_CANCEL:
            //     // 响应中_拒绝取消状态允许：3申请取消
            //     return operationType == 3;
            // case RESPONDING_REJECT_MODIFY:
            //     // 响应中_拒绝修改状态允许：4申请修改
            //     return operationType == 4 || operationType == 3;
            case ACCEPTED_TO_BE_SETTLED:
                // 验收通过_待结算状态允许：11结算完成
                return operationType == 11;

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

@@ -199,10 +199,10 @@
                workOrder.setServiceParty(AuthUtil.getNickName());
                break;
            case 6: // 不同意取消
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
                break;
            case 8: // 不同意修改
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
                newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
                workOrder.setServiceParty(AuthUtil.getNickName());
                break;
            case 9: // 协商修改 --> 协商修改