Merge branch 'master-vehicle-price' into dev-tiande

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleHolidayPriceInfo.java

@@ -117,8 +117,8 @@ public class VehicleHolidayPriceInfo implements Serializable {
 	private Integer isDel;
 
 	@Transient
-	private String startDate;
+	private String startTime;
 
 	@Transient
-	private String endDate;
+	private String endTime;
 }

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

@@ -21,4 +21,8 @@ public class VehicleHolidayPriceInfoVo {
 
 	private String vehicleId;
 
+	private Integer allModelUse;
+
+	private Integer allVehicleUse;
+
 }

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

@@ -4,8 +4,8 @@
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleHolidayPriceInfoMapper">
 
     <select id="getAll" resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleHolidayPriceInfoVo">
-        select festival_id, festival_day, MIN(festival_date) as startTime, MAX(festival_date) as endTime, rent_price, rent_free_day,vehicle_id from vehicle_holiday_price_info
-        GROUP BY festival_id,festival_day,rent_price, rent_free_day,vehicle_id
+        select festival_id, festival_day, MIN(festival_date) as startTime, MAX(festival_date) as endTime, rent_price, rent_free_day,vehicle_id, all_model_use, all_vehicle_use from vehicle_holiday_price_info
+        GROUP BY festival_id,festival_day,rent_price, rent_free_day,vehicle_id, all_model_use, all_vehicle_use
         HAVING vehicle_id = #{vehicleId}
         <if test="festivalId != null">
             and festival_id = #{festivalId}