Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

2025-08-18 3d3fa72ebf55f841c8ede01c59347af5e44b773b

 service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java

@@ -5,7 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
import lombok.Data;
/**
 * 调度单对象 dispatch_order
@@ -24,9 +23,10 @@

    /** 调度单号 */
    @Excel(name = "调度单号")

        @TableField("dispatch_no")
    @TableField("dispatch_no")
    private String dispatchNo;
    @TableField("customer_name")
    private String customerName;


    /** 运输方式 */
@@ -208,16 +208,9 @@
        @TableField("is_deleted")
    private Integer isDeleted;

    public String getActualDepartureTimeBegin() {
        return actualDepartureTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
    }

    public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
        this.actualDepartureTimeBegin = actualDepartureTimeBegin;
    }
        this.actualDepartureTimeBegin = actualDepartureTimeBegin!=null?actualDepartureTimeBegin+" 00:00:00":null;

    public String getActualDepartureTimeEnd() {
        return actualDepartureTimeEnd;
    }

    public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
@@ -226,34 +219,19 @@



    public String getRequiredArrivalTimeBegin() {
        return requiredArrivalTimeBegin;
    }

    public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
        this.requiredArrivalTimeBegin = requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
    }

    public String getRequiredArrivalTimeEnd() {
        return requiredArrivalTimeEnd;
    }

    public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
        this.requiredArrivalTimeEnd = requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
    }



    public String getActualArrivalTimeBegin() {
        return actualArrivalTimeBegin;
    }

    public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
        this.actualArrivalTimeBegin = actualArrivalTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
    }

    public String getActualArrivalTimeEnd() {
        return actualArrivalTimeEnd;
    }

    public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {