diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java index 7d73443b9..ddbd1780e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java @@ -2,7 +2,7 @@ * @Project: emis * @Title: EmisDestination.java * @author linfso - * @date 2024-01-11 05:28:11 + * @date 2024-04-17 01:13:51 * @Copyright: ShangHai Duta 2022 All rights reserved. * @version v1.0 * @Description:

目的地 实体类

@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel; import com.xdadan.erp.common.core.domain.BaseEntity; import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -25,7 +26,7 @@ import lombok.Data; * @ClassName EmisDestination * @Description 目的地 * @author linfso - * @date 2024-01-11 05:28:11 + * @date 2024-04-17 01:13:51 */ @Data public class EmisDestination extends BaseEntity @@ -42,12 +43,12 @@ public class EmisDestination extends BaseEntity private String destNameEn; /* 启用状态 0-启用 1-停用 */ private Integer status; + /* 线路编号 */ + private String lineCode; /* 所属国家 */ private String country; /* 服务网点编号 */ private String siteCode; - /* 服务网点名称 */ - private String siteName; /* 省 */ private String province; /* 市 */ @@ -58,9 +59,14 @@ public class EmisDestination extends BaseEntity private String town; /* 是否偏远地区 0-否 1-是 */ private Integer isHinterland; - /* 创建网点 */ - private String createSite; - /* 更新网点 */ - private String updateSite; + + + private String lineName; + private String countryName; + private String provinceName; + private String cityName; + private String countyName; + private String townName; + } diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml index f4df6a2dd..fb5a62237 100644 --- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml @@ -10,9 +10,9 @@ + - @@ -27,23 +27,47 @@ + + + + + + + + + - select id, dest_code, dest_name, dest_name_en, status, country, site_code, site_name, province, city, county, town, is_hinterland, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination + select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination + + + + + + + + + @@ -76,9 +100,9 @@ dest_name, dest_name_en, status, + line_code, country, site_code, - site_name, province, city, county, @@ -100,9 +124,9 @@ #{destName}, #{destNameEn}, #{status}, + #{lineCode}, #{country}, #{siteCode}, - #{siteName}, #{province}, #{city}, #{county}, @@ -127,9 +151,9 @@ dest_name = #{destName}, dest_name_en = #{destNameEn}, status = #{status}, + line_code = #{lineCode}, country = #{country}, site_code = #{siteCode}, - site_name = #{siteName}, province = #{province}, city = #{city}, county = #{county},