🐛 修复车辆未填外廓尺寸时详情显示 -1

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-13 12:55:15 +08:00
parent e0da79d745
commit 44b4ae2d74
2 changed files with 27 additions and 0 deletions
@@ -225,6 +225,11 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl<TransportVehicl
 		vehicle.setRoadTransportCertImage(trimToNull(vehicle.getRoadTransportCertImage()));
 		vehicle.setRegistrationImage(trimToNull(vehicle.getRegistrationImage()));
 		vehicle.setRemark(trimToNull(vehicle.getRemark()));
+		// BladeX 数字 null 常序列化为 -1；未填外廓尺寸/准牵引总质量不得落库占位值
+		vehicle.setOuterLength(normalizeOptionalInteger(vehicle.getOuterLength()));
+		vehicle.setOuterWidth(normalizeOptionalInteger(vehicle.getOuterWidth()));
+		vehicle.setOuterHeight(normalizeOptionalInteger(vehicle.getOuterHeight()));
+		vehicle.setTractionMassKg(normalizeOptionalInteger(vehicle.getTractionMassKg()));
 		if (vehicle.getCompulsoryScrapLongTerm() == null) {
 			vehicle.setCompulsoryScrapLongTerm(DEFAULT_FALSE);
 		}
@@ -352,6 +357,16 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl<TransportVehicl
 		return value == null ? 0L : value;
 	}

+	/**
+	 * 可选整型字段：null / -1 均视为未填写
+	 */
+	private Integer normalizeOptionalInteger(Integer value) {
+		if (value == null || value == -1) {
+			return null;
+		}
+		return value;
+	}
+
 	private String trimToEmpty(String value) {
 		return value == null ? "" : value.trim();
 	}
@@ -48,7 +48,19 @@ public class TransportVehicleWrapper extends BaseEntityWrapper<TransportVehicle,
 	public TransportVehicleVO entityVO(TransportVehicle vehicle) {
 		TransportVehicleVO vo = Objects.requireNonNull(BeanUtil.copyProperties(vehicle, TransportVehicleVO.class));
 		vo.setCreateUserName(UserCache.getUserRealName(vehicle.getCreateUser()));
+		// BladeX 数字 null 常序列化为 -1；详情展示时把未填尺寸还原为空
+		vo.setOuterLength(normalizeOptionalInteger(vo.getOuterLength()));
+		vo.setOuterWidth(normalizeOptionalInteger(vo.getOuterWidth()));
+		vo.setOuterHeight(normalizeOptionalInteger(vo.getOuterHeight()));
+		vo.setTractionMassKg(normalizeOptionalInteger(vo.getTractionMassKg()));
 		return vo;
 	}

+	private Integer normalizeOptionalInteger(Integer value) {
+		if (value == null || value == -1) {
+			return null;
+		}
+		return value;
+	}
+
 }