diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index b27c7cd..b0f345b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -72,9 +72,16 @@ * 区域 */ @ExcelProperty("街道") - @NotBlank(message = "街道不能为空") +// @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; + + /** + * 区域 + */ + @ExcelProperty("道路") + @TableField("ROAD") + private String road; /** * 第三方坐标系X */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index b27c7cd..b0f345b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -72,9 +72,16 @@ * 区域 */ @ExcelProperty("街道") - @NotBlank(message = "街道不能为空") +// @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; + + /** + * 区域 + */ + @ExcelProperty("道路") + @TableField("ROAD") + private String road; /** * 第三方坐标系X */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index cf88b33..da22fe2 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -160,13 +160,13 @@ } //其他相关性校验 - String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); - if (StrUtil.isNotEmpty(areaId)) { - well.setArea(areaId); - } else { - list.add("第" + index[0] + "行,区与街道名不对应!"); - break; - } +// String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); +// if (StrUtil.isNotEmpty(areaId)) { +// well.setArea(areaId); +// } else { +// list.add("第" + index[0] + "行,区与街道名不对应!"); +// break; +// } if (sluicewellTypeMap.containsKey(well.getWellType())) { well.setWellType(sluicewellTypeMap.get(well.getWellType()));