diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java index d68c174..c768e26 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java @@ -84,6 +84,16 @@ public class PortTerminal extends BaseEntity { */ @Schema(description = "国家") private String country; + /** + * 省份编码 + */ + @Schema(description = "省份编码") + private String provinceCode; + /** + * 省份 + */ + @Schema(description = "省份") + private String provinceName; /** * 城市 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java index 5044906..1786f85 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java @@ -74,6 +74,9 @@ public class PortTerminalExcel implements Serializable { @ExcelProperty("国家*") private String country; + @ExcelProperty("所属省份*") + private String provinceName; + @ExcelProperty("城市*") private String city; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java index 44761ac..b1c6471 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java @@ -48,6 +48,9 @@ public class PortTerminalExportExcel implements Serializable { @ExcelProperty("国家") private String country; + @ExcelProperty("所属省份") + private String provinceName; + @ExcelProperty("城市") private String city; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.java index 1b4031d..ff68f78 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.java @@ -27,6 +27,7 @@ package org.springblade.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.springblade.system.pojo.entity.PortTerminal; import org.springblade.system.pojo.vo.PortTerminalVO; @@ -39,6 +40,16 @@ import java.util.List; */ public interface PortTerminalMapper extends BaseMapper { + /** + * 按编码查询港口码头(包含逻辑删除记录,用于导入恢复)。 + */ + PortTerminal selectByCodeIncludingDeleted(@Param("code") String code); + + /** + * 恢复逻辑删除港口码头。 + */ + int restoreById(@Param("id") Long id); + /** * 自定义分页 * diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml index d881bee..d86b165 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml @@ -19,6 +19,8 @@ + + @@ -30,6 +32,19 @@ + + + + UPDATE blade_port_terminal + SET is_deleted = 0 + WHERE id = #{id} + AND is_deleted = 1 + + + SELECT * + FROM blade_railway_station + WHERE code = #{code} + + + + UPDATE blade_railway_station + SET is_deleted = 0 + WHERE id = #{id} + AND is_deleted = 1 + +