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

sen

2025-09-28 ae3cd0dd4764559f98e1700faf889f5eddd8ac2b

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

@@ -66,6 +66,8 @@
    @Excel(name = "订单下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @TableField("order_time")
    private Date orderTime;
    private String orderTimeBegin;
    private String orderTimeEnd;


    /** 订单创建时间 */
@@ -73,6 +75,8 @@
    @Excel(name = "订单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @TableField("order_created_time")
    private Date orderCreatedTime;
    private String orderCreatedTimeBegin;
    private String orderCreatedTimeEnd;


    /** 调度单创建时间 */
@@ -80,6 +84,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("dispatch_created_time")
    private Date dispatchCreatedTime;
    private String dispatchCreatedTimeBegin;
    private String dispatchCreatedTimeEnd;


    /** 钥匙领取时间（请求查询时间） */
@@ -181,4 +187,28 @@
    @Excel(name = "钥匙柜编号")
    @TableField("box_num")
    private String boxNum;

    public void setOrderTimeBegin(String orderTimeBegin) {
        this.orderTimeBegin = orderTimeBegin==null? null :orderTimeBegin+ " 00:00:00";
    }

    public void setOrderTimeEnd(String orderTimeEnd) {
        this.orderTimeEnd = orderTimeEnd==null?null:orderTimeEnd+ " 23:59:59";
    }

    public void setOrderCreatedTimeBegin(String orderCreatedTimeBegin) {
        this.orderCreatedTimeBegin = orderCreatedTimeBegin==null? null :orderCreatedTimeBegin+ " 00:00:00";
    }

    public void setOrderCreatedTimeEnd(String orderCreatedTimeEnd) {
        this.orderCreatedTimeEnd = orderCreatedTimeEnd==null?null:orderCreatedTimeEnd+ " 23:59:59";
    }

    public void setDispatchCreatedTimeBegin(String dispatchCreatedTimeBegin) {
        this.dispatchCreatedTimeBegin = dispatchCreatedTimeBegin==null? null :dispatchCreatedTimeBegin+ " 00:00:00";
    }

    public void setDispatchCreatedTimeEnd(String dispatchCreatedTimeEnd) {
        this.dispatchCreatedTimeEnd = dispatchCreatedTimeEnd==null?null:dispatchCreatedTimeEnd+ " 23:59:59";
    }
}