销售订单

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -172,6 +172,14 @@
             <if test="outStatusList != null and outStatusList.size() > 0">
                 AND tpo.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
             </if>
+            <if test="makeTimeStart != null and makeTimeEnd != null">
+                AND tpo.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND tpo.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+            </if>
+            <if test="deliveryDateStart != null and deliveryDateEnd != null">
+                AND tpo.delivery_date &gt;= #{deliveryDateStart}::timestamp with time zone
+                AND tpo.delivery_date &lt; #{deliveryDateEnd}::timestamp with time zone + interval '1 day'
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -415,6 +415,25 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
 
     @ApiModelProperty(value = "出库状态List")
     private List<String> outStatusList;
+
+    @ApiModelProperty(value = "制单时间开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate makeTimeStart;
+
+    @ApiModelProperty(value = "制单时间结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate makeTimeEnd;
+
+    @ApiModelProperty(value = "送货日期开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate deliveryDateStart;
+
+    @ApiModelProperty(value = "送货日期结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate deliveryDateEnd;
+
+
+
     /*
      * 相关属性
      * @TableField(exist = false)