修改车辆信息

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

@@ -59,7 +59,8 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap
 		}
 		if (vehicleList == null || vehicleList.size() <= 0) { //单个车辆可用
 			VehicleCommonPriceInfo oldValue = getByVehicleId(vehicleCommonPriceInfo.getVehicleId());
-			if (oldValue == null && vehicleCommonPriceInfo.getId() == null) {
+			if (oldValue == null) {
+				vehicleCommonPriceInfo.setId(null);
 				insertSelectiveRe(vehicleCommonPriceInfo);
 			} else {
 				BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));

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

@@ -55,7 +55,8 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 			for(String date : getAllDate(vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate())) {
 				vehicleHolidayPriceInfo.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
 				VehicleHolidayPriceInfo oldValue = getByVehicleId(vehicleHolidayPriceInfo.getVehicleId(),  date);
-				if (oldValue == null && vehicleHolidayPriceInfo.getId() == null) {
+				if (oldValue == null) {
+					vehicleHolidayPriceInfo.setId(null);
 					insertSelectiveRe(vehicleHolidayPriceInfo);
 				} else {
 					BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
@@ -72,7 +73,8 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 						vehicleHolidayPriceInfo.setVehicleId(vehicleInfo.getId());
 						vehicleHolidayPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch());
 						vehicleHolidayPriceInfo.setModelId(vehicleInfo.getModelId());
-						if (oldValue == null && vehicleHolidayPriceInfo.getId() == null) {
+						vehicleHolidayPriceInfo.setId(null);
+						if (oldValue == null ) {
 							insertSelectiveRe(vehicleHolidayPriceInfo);
 						} else {
 							BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));