草稿要车单增加计划装货时间筛选

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDate;
 
 
 @Data
 @Data
 public class QueryDraftRequestCarTicketVo extends PageVo implements BaseVo, Serializable {
 public class QueryDraftRequestCarTicketVo extends PageVo implements BaseVo, Serializable {
@@ -55,4 +56,10 @@ public class QueryDraftRequestCarTicketVo extends PageVo implements BaseVo, Seri
     @ApiModelProperty("搜索")
     @ApiModelProperty("搜索")
     private String searchKey;
     private String searchKey;
 
 
+    @ApiModelProperty("计划装货日期开始")
+    private LocalDate deliveryDateStart;
+
+    @ApiModelProperty("计划装货日期结束")
+    private LocalDate deliveryDateEnd;
+
 }
 }

@@ -104,6 +104,14 @@
                 AND (tb.order_no LIKE CONCAT('%', #{vo.searchKey}, '%')
                 AND (tb.order_no LIKE CONCAT('%', #{vo.searchKey}, '%')
                 OR cu.name LIKE CONCAT('%', #{vo.searchKey}, '%'))
                 OR cu.name LIKE CONCAT('%', #{vo.searchKey}, '%'))
             </if>
             </if>
+            <if test="vo.deliveryDateStart != null">
+                AND tb.delivery_date >= #{vo.deliveryDateStart}
+            </if>
+            <if test="vo.deliveryDateEnd != null">
+                <![CDATA[
+                  AND tb.delivery_date < DATE_ADD(#{vo.deliveryDateEnd}, INTERVAL 1 DAY)
+                ]]>
+            </if>
         </where>
         </where>
         ORDER BY tb.create_time DESC
         ORDER BY tb.create_time DESC
     </select>
     </select>