diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordImportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordImportExcel.java index f3e7f6b..4eb3502 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordImportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordImportExcel.java @@ -60,8 +60,11 @@ public class ViolationRecordImportExcel implements Serializable { @ExcelProperty("*驾驶人") private String driverName; - @ExcelProperty("*类型/事项") - private String violationTypeOrItem; + @ExcelProperty("*类型") + private String violationType; + + @ExcelProperty("*事项") + private String violationItem; @ExcelProperty("*时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java index ed9dfe9..4d99a4f 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java @@ -67,6 +67,8 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl selectViolationRecordPage(IPage page, ViolationRecordVO violationRecord) { @@ -81,6 +83,7 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl + * 必须在 validate 之后执行:校验需要看到用户填了什么, + * 若提前清空,误填的内容会被静默丢弃,用户无从察觉。 + */ + private void clearIrrelevantField(ViolationRecord violationRecord) { + if (CAR.equals(violationRecord.getVehicleType())) { violationRecord.setViolationItem(null); } else { violationRecord.setViolationType(null); } - if (UNPROCESSED.equals(violationRecord.getProcessStatus())) { - violationRecord.setProcessResult(null); - } } private void validate(ViolationRecord violationRecord) { if (Func.isEmpty(violationRecord.getVehicleType())) { throw new ServiceException("车船类型不能为空"); } - if (!"车辆".equals(violationRecord.getVehicleType()) && !"船舶".equals(violationRecord.getVehicleType())) { + if (!CAR.equals(violationRecord.getVehicleType()) && !SHIP.equals(violationRecord.getVehicleType())) { throw new ServiceException("车船类型不正确"); } if (Func.isEmpty(violationRecord.getVehicleNo())) { @@ -155,12 +162,18 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl