Merge branch 'master-zjw'

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

 package com.xxfc.platform.vehicle.pojo;
 
+import com.github.wxiaoqi.security.common.constant.CommonConstants;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +28,10 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty(hidden = true)
         String endDate;
         @ApiModelProperty(hidden = true)
+        String startDateTime;
+        @ApiModelProperty(hidden = true)
+        String endDateTime;
+        @ApiModelProperty(hidden = true)
         String startDateExtend;
         @ApiModelProperty(hidden = true)
         String endDateExtend;
@@ -66,13 +71,15 @@ public class UsableVeicleDTO extends PageParam {
         public void setStartDateTamp(Long startDateTamp) {
             this.startDateTamp = startDateTamp;
             this.startDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)));
+            this.startDateTime = CommonConstants.DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)));
             this.startDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)).minusDays(1L));
         }
 
         public void setEndDateTamp(Long endDateTamp) {
-                this.endDateTamp = endDateTamp;
-                this.endDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)));
-                this.endDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)).plusDays(1L));
+            this.endDateTamp = endDateTamp;
+            this.endDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)));
+            this.endDateTime = CommonConstants.DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)));
+            this.endDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)).plusDays(1L));
         }
 
 //        private Boolean isTest;

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

@@ -1214,8 +1214,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             }else {
                 notBookedDates = convertDatePeriod2List(dto.getStartDate(),
                     dto.getEndDate());
-                dto.setStartDateExtend(dto.getStartDate());
-                dto.setEndDateExtend(dto.getEndDate());
+                dto.setStartDateExtend(dto.getStartDateTime());
+                dto.setEndDateExtend(dto.getEndDateTime());
+//                dto.setStartDateExtend(dto.getStartDate());
+//                dto.setEndDateExtend(dto.getEndDate());
                 params = BeanUtil.beanToMap(dto);
             }
         }
@@ -1250,8 +1252,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
             notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
                     dto.getBookEndDate());
-            dto.setStartDateExtend(dto.getBookStartDate());
-            dto.setEndDateExtend(dto.getBookEndDate());
+//            dto.setStartDateExtend(dto.getBookStartDate());
+//            dto.setEndDateExtend(dto.getBookEndDate());
+            dto.setStartDateExtend(dto.getBookStartDateTime());
+            dto.setEndDateExtend(dto.getBookEndDateTime());
 
 //            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
 //                    dto.getEndDateExtend());

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -131,7 +131,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
      * @param dto
      * @return
      */
-    @ApiOperation("可用车辆查询")
+    @ApiOperation("后台可用车辆查询")
     @RequestMapping(value = "/rent/back-stage/usable-vehicle", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> rentBgUsableVehicle(UsableVeicleDTO dto) throws Exception {