新增时间查询状态

wujianwei

2025-07-29 5269c06d291f9f18d082983f63c4afb193a6bd80

新增时间查询状态

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

@@ -107,24 +107,35 @@


    /** 实际出发时间 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "实际出发时间", width = 30, dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "实际出发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField("actual_departure_time")
    private Date actualDepartureTime;

    @TableField(exist = false)
    private String actualDepartureTimeBegin;
    @TableField(exist = false)
    private String actualDepartureTimeEnd;

    /** 要求到达时间 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "要求到达时间", width = 30, dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "要求到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
        @TableField("required_arrival_time")
    private Date requiredArrivalTime;
    @TableField(exist = false)
    private String requiredArrivalTimeBegin;
    @TableField(exist = false)
    private String requiredArrivalTimeEnd;


    /** 实际到达时间 */
    @Excel(name = "实际到达时间", width = 30, dateFormat = "yyyy-MM-dd")
        @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "实际到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
        @TableField("actual_arrival_time")
    private Date actualArrivalTime;
    @TableField(exist = false)
    private String actualArrivalTimeBegin;
    @TableField(exist = false)
    private String actualArrivalTimeEnd;


    /** 是否回程(N,Y) */
@@ -197,5 +208,55 @@
        @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;
    }

    public String getActualDepartureTimeEnd() {
        return actualDepartureTimeEnd!=null?actualDepartureTimeEnd+" 23:59:59":null;
    }

    public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
        this.actualDepartureTimeEnd = actualDepartureTimeEnd;
    }



    public String getRequiredArrivalTimeBegin() {
        return requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
    }

    public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
        this.requiredArrivalTimeBegin = requiredArrivalTimeBegin;
    }

    public String getRequiredArrivalTimeEnd() {
        return requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
    }

    public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
        this.requiredArrivalTimeEnd = requiredArrivalTimeEnd;
    }



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

    public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
        this.actualArrivalTimeBegin = actualArrivalTimeBegin;
    }

    public String getActualArrivalTimeEnd() {
        return actualArrivalTimeEnd!=null?actualArrivalTimeEnd+" 23:59:59":null;
    }

    public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
        this.actualArrivalTimeEnd = actualArrivalTimeEnd;
    }
}

 service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml

@@ -77,9 +77,9 @@
        <if test="assistantDriverName != null  and assistantDriverName != ''"> and  driver_a.NAME like concat('%', #{assistantDriverName}, '%')</if>
        <if test="pointNum != null "> and ts.POINT_NUM = #{pointNum}</if>
        <if test="quantity != null "> and ts.QUANTITY = #{quantity}</if>
        <if test="actualDepartureTime != null "> and ts.ACTUAL_DEPARTURE_TIME = #{actualDepartureTime}</if>
        <if test="requiredArrivalTime != null "> and ts.REQUIRED_ARRIVAL_TIME = #{requiredArrivalTime}</if>
        <if test="actualArrivalTime != null "> and ts.ACTUAL_ARRIVAL_TIME = #{actualArrivalTime}</if>
        <if test="actualDepartureTimeBegin != null and actualDepartureTimeBegin!='' and actualDepartureTimeEnd != null and actualDepartureTimeEnd!='' "> and ts.ACTUAL_DEPARTURE_TIME between #{actualDepartureTimeBegin} and #{actualDepartureTimeEnd}</if>
        <if test="requiredArrivalTimeBegin != null and requiredArrivalTimeBegin!='' and requiredArrivalTimeEnd != null and requiredArrivalTimeEnd!='' "> and ts.REQUIRED_ARRIVAL_TIME between #{requiredArrivalTimeEnd} and #{requiredArrivalTimeEnd}</if>
        <if test="actualArrivalTimeBegin != null and actualArrivalTimeBegin!='' and actualArrivalTimeEnd != null and actualArrivalTimeEnd!='' "> and ts.ACTUAL_ARRIVAL_TIME between #{actualArrivalTimeEnd} and #{actualArrivalTimeEnd}</if>
        <if test="beReturn != null  and beReturn != ''"> and ts.BE_RETURN = #{beReturn}</if>
        <if test="dispatchQuantity != null "> and ts.DISPATCH_QUANTITY = #{dispatchQuantity}</if>
        <if test="dispatchWeight != null "> and ts.DISPATCH_WEIGHT = #{dispatchWeight}</if>
@@ -257,7 +257,6 @@

    </select>
    <select id="selectDispatchOrderAttachment" resultType="com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo">
            -- 查询调度单号或者调度单ID查附件
SELECT
--     image.PATH,
    CONCAT('https://tms.ygalogisticspark.com/ImageViewServlet?id=',image.id) as imageUrl,
@@ -281,7 +280,7 @@
    left join base_fee_item bfi on bfi.id=tof.FEE_TYPE_ID
WHERE
    ts.DISPATCH_NO =  #{no}
    AND image.biz_Type = 'com.vtradex.tms.core.model.entity.fee.TmsOtherFee';
    AND image.biz_Type = 'com.vtradex.tms.core.model.entity.fee.TmsOtherFee'


    </select>