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

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

 package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
 
 import javax.persistence.Column;
 import java.util.Date;
@@ -200,9 +197,5 @@ public class AddOrUpdateVehicleVo {
 
     private String registerDate;
 
-    public void setRegisterDate() {
-        if (StringUtils.isNotBlank(registerDate)) {
-            this.vehicleRegisterDate = DateTime.parse(registerDate, DateTimeFormat.forPattern("yyyy-MM-dd")).toDate();
-        }
-    }
+
 }
\ No newline at end of file

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

@@ -225,6 +225,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         for (AddOrUpdateVehicleVo addOrUpdateVehicleVo : addOrUpdateVehicleVoList) {
 
             Vehicle vehicle = new Vehicle();
+            if (StringUtils.isNotBlank(addOrUpdateVehicleVo.getRegisterDate())) {
+                addOrUpdateVehicleVo.setVehicleRegisterDate(DateTime.parse(addOrUpdateVehicleVo.getRegisterDate(), DateTimeFormat.forPattern("yyyy-MM-dd")).toDate());
+            }
             BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
 
             if (addOrUpdateVehicleVo.getParkBranchCompanyId() == null) {
@@ -293,6 +296,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         }
         for (AddOrUpdateVehicleVo addOrUpdateVehicleVo : addOrUpdateVehicleVoList) {
             Vehicle vehicle = new Vehicle();
+            if (StringUtils.isNotBlank(addOrUpdateVehicleVo.getRegisterDate())) {
+                addOrUpdateVehicleVo.setVehicleRegisterDate(DateTime.parse(addOrUpdateVehicleVo.getRegisterDate(), DateTimeFormat.forPattern("yyyy-MM-dd")).toDate());
+            }
             BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
             if (addOrUpdateVehicleVo.getParkBranchCompanyId() == null) {
                 throw new BaseException(ResultCode.RET_COMPANY_CAN_NOT_BE_NULL);