Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
-
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;

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

@@ -295,7 +295,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
-    @Scheduled(cron = "0 0 */2 * * *")
+    @Scheduled(cron = "0 */5 * * * *")
     public void add() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;

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

@@ -526,6 +526,19 @@
             and v1.book_end_date between #{startTime} and #{endTime}
         </if>
     </select>
+
+    <!--获取所有已取消的预定记录-->
+    <select id="selectAllCancelBookRecord" resultMap="searchBookRecord" parameterType="Map">
+        select v1.* from vehicle_book_record v1
+        where v1.status in (4,6)
+        <if test="startTime != null and status == 1">
+            and v1.book_start_date between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and status == 2">
+            and v1.book_end_date between #{startTime} and #{endTime}
+        </if>
+    </select>
+
     <select id="selectByIds" resultMap="searchBookRecord" parameterType="Map">
         select v1.* from vehicle_book_record v1
         where v1.status not in (4,6,7,3)