b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-08-27 12:54:10 +08:00
parent b750f6ecf0
commit 171887811c
23 changed files with 377 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java
+8 -8
View File
@@ -53,13 +53,13 @@ public class PortTerminalExcel implements Serializable {
@ExcelIgnore
private Long id;
@ExcelProperty("编码")
@ExcelProperty("*编码")
private String code;
@ExcelProperty("港口/码头名称")
@ExcelProperty("*港口/码头名称")
private String name;
@ExcelProperty("类型")
@ExcelProperty("*类型")
private String category;
@ExcelProperty("上级港口")
@@ -68,13 +68,13 @@ public class PortTerminalExcel implements Serializable {
@ExcelProperty("上级港口编码")
private String parentCode;
@ExcelProperty("国家")
@ExcelProperty("*国家")
private String country;
@ExcelProperty("城市")
@ExcelProperty("*城市")
private String city;
@ExcelProperty("区县")
@ExcelProperty("*区县")
private String districtName;
@ExcelProperty("行政区划编码")
@@ -83,11 +83,11 @@ public class PortTerminalExcel implements Serializable {
@ExcelProperty("详细地址")
private String detailAddress;
@ExcelProperty("经度")
@ExcelProperty("*经度")
@NumberFormat("0.000000")
private BigDecimal longitude;
@ExcelProperty("纬度")
@ExcelProperty("*纬度")
@NumberFormat("0.000000")
private BigDecimal latitude;
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PortTerminalServiceImpl.java
+13 -5
View File
@@ -392,11 +392,14 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
portTerminal.setParentId(parent.getId());
portTerminal.setParentCode(parent.getCode());
portTerminal.setParentName(parent.getName());
portTerminal.setCountry(parent.getCountry());
portTerminal.setCity(parent.getCity());
portTerminal.setDistrictCode(parent.getDistrictCode());
portTerminal.setDistrictName(parent.getDistrictName());
portTerminal.setRegionCode(parent.getDistrictCode());
portTerminal.setCountry(inheritParentValue(parent.getCountry(), portTerminal.getCountry()));
portTerminal.setCity(inheritParentValue(parent.getCity(), portTerminal.getCity()));
portTerminal.setDistrictCode(inheritParentValue(parent.getDistrictCode(), portTerminal.getDistrictCode()));
portTerminal.setDistrictName(inheritParentValue(parent.getDistrictName(), portTerminal.getDistrictName()));
portTerminal.setRegionCode(inheritParentValue(parent.getDistrictCode(), portTerminal.getRegionCode()));
if (Func.isEmpty(portTerminal.getDistrictCode()) && Func.isNotEmpty(portTerminal.getDistrictName())) {
fillRegion(portTerminal);
}
}
private void fillRegion(PortTerminal portTerminal) {
@@ -560,4 +563,9 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
return trimValue.isEmpty() ? null : trimValue;
}
private String inheritParentValue(String parentValue, String currentValue) {
String normalizedParentValue = trimToNull(parentValue);
return normalizedParentValue == null ? currentValue : normalizedParentValue;
}
}