wlzboy
2026-03-24 6676a35122fd9c97d1b1679c211bc8a9b97f08f2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
@@ -143,6 +143,27 @@
    public void setShowTaskCode(String showTaskCode) {
         showTaskCode=this.showTaskCode;
    }
    // 用于SQL映射的字段(多码查询优化)
    //这些字段接收SQL查询中计算出的dispatchCode和serviceCode值
    private String dispatchCode;
    private String serviceCode;
    public String getDispatchCode() {
        return dispatchCode;
    }
    public void setDispatchCode(String dispatchCode) {
        this.dispatchCode = dispatchCode;
    }
    public String getServiceCode() {
        return serviceCode;
    }
    public void setServiceCode(String serviceCode) {
        this.serviceCode = serviceCode;
    }
    /**
     * 获取显示任务编号,优先返回急救转运的调度单编号,其次是服务单编号,最后是任务编号
     */
@@ -420,6 +441,9 @@
        
        // 状态流转规则
        switch (currentStatus) {
            case NOT_CONFIRMED:
            case NOT_DEPARTED:
            case PARTIALLY_CONFIRMED:
            case PENDING:
                // 待处理 -> 出发中、已取消
                return newStatus == TaskStatus.DEPARTING || newStatus == TaskStatus.CANCELLED;
@@ -433,8 +457,12 @@
                // 返程中 -> 已完成
                return newStatus == TaskStatus.COMPLETED;
            case IN_PROGRESS:
                // 兼容旧数据:任务中 -> 已完成、已取消、待处理
                return newStatus == TaskStatus.COMPLETED || newStatus == TaskStatus.CANCELLED || newStatus == TaskStatus.PENDING;
                // 兼容旧数据:任务中 -> 已完成、已取消、待处理、已到达、返程中
                return newStatus == TaskStatus.COMPLETED
                    || newStatus == TaskStatus.CANCELLED
                    || newStatus == TaskStatus.PENDING
                    || newStatus == TaskStatus.ARRIVED
                    || newStatus == TaskStatus.RETURNING;
            case COMPLETED:
            case CANCELLED:
                // 已完成、已取消 -> 不允许任何状态变更