统计报表：增加订货日期筛选

@@ -65,4 +65,10 @@ public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("订货单类型")
     @ApiModelProperty("订货单类型")
     private String type;
     private String type;
 
 
+    @ApiModelProperty("订货日期")
+    private String orderDateStart;
+
+    @ApiModelProperty("订货日期")
+    private String orderDateEnd;
+
 }
 }

@@ -53,4 +53,10 @@ public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, S
      */
      */
     @ApiModelProperty("导出类型")
     @ApiModelProperty("导出类型")
     private String exportType;
     private String exportType;
+
+    @ApiModelProperty("订货日期")
+    private String orderDateStart;
+
+    @ApiModelProperty("订货日期")
+    private String orderDateEnd;
 }
 }

@@ -223,6 +223,14 @@
             <if test="vo.type != null and vo.type != ''">
             <if test="vo.type != null and vo.type != ''">
                 AND tb.type = #{vo.type}
                 AND tb.type = #{vo.type}
             </if>
             </if>
+            <if test="vo.orderDateStart != null">
+                AND tb.order_date >= #{vo.orderDateStart}
+            </if>
+            <if test="vo.orderDateEnd != null">
+                <![CDATA[
+               AND tb.order_date <= #{vo.orderDateEnd}
+                ]]>
+            </if>
         </where>
         </where>
         ) t
         ) t
         ORDER BY
         ORDER BY

@@ -110,6 +110,14 @@
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
              AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
              AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
             </if>
             </if>
+            <if test="vo.orderDateStart != null">
+                AND tb.order_date >= #{vo.orderDateStart}
+            </if>
+            <if test="vo.orderDateEnd != null">
+                <![CDATA[
+               AND tb.order_date <= #{vo.orderDateEnd}
+                ]]>
+            </if>
         </where>
         </where>
         ORDER BY tb.shipment_date DESC
         ORDER BY tb.shipment_date DESC
     </select>
     </select>