Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -51,6 +51,9 @@ public class VehicleBookRecordQueryVo extends PageParam {
      */
     private Integer bookType;
 
+    //是否需要过滤数据，默认限制
+    private boolean flag = true;
+
     private Integer companyId;
 
     private List<Integer> companyIds;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -249,6 +249,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             Iterator<VehicleBookRecordVo> iterator = list.iterator();
             while (iterator.hasNext()) {
                 VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                //已出车记录
                 if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
                     iterator.remove();
                 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -502,7 +502,16 @@
             <if test="code != null">
                 and v3.code = #{code}
             </if>
-            and v1.book_user != -2 and book_end_date &gt;= now()
+            <!--增加时间限制，未审核的小于当前时间的不显示-->
+            <if test="flag == true and status == 1">
+                and book_end_date &gt;= now()
+            </if>
+            <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间后两天的不显示-->
+            <if test="flag == true and (status == 2 || status == 3)">
+                and ((v4.id is not NULL and v1.book_end_date &gt;= DATE_ADD(NOW(),interval '2 00:00:00' DAY_SECOND)) or
+                (v4.id is NULL and v1.book_end_date &gt;= now())
+            </if>
+            and v1.book_user != -2
         </where>
         group by v1.id
         order by create_time DESC