From 39cb174ee20473b92e60476059b046c64b869de6 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 11 May 2024 16:04:21 +0800 Subject: [PATCH] md --- .../xdadan/erp/emis/domain/EmisTransLine.java | 5 +-- .../erp/emis/domain/EmisTransProduct.java | 5 ++- .../resources/mapper/EmisTransLineMapper.xml | 32 ++++++++++++----- .../mapper/EmisTransProductMapper.xml | 35 ++++++++++++++----- 4 files changed, 57 insertions(+), 20 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java index 112d37c36..5186e4454 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java @@ -31,7 +31,6 @@ import lombok.Data; public class EmisTransLine extends BaseEntity { private static final long serialVersionUID = 1L; - /* 序号 */ private Long id; /* 线路代码 */ @@ -42,7 +41,7 @@ public class EmisTransLine extends BaseEntity private String lineNameEn; /* 计泡方式 */ private String meterRate; - /* 启用状态 */ + /* 启用状态 0-未启用 1-启用 */ private Integer status; /* 单证员 */ private String siteAuditMan; @@ -66,6 +65,8 @@ public class EmisTransLine extends BaseEntity private String logoType; /* 运输方式 */ private String transType; + /* 显示顺序 */ + private Integer orderNum; private String fromCountryName; private String countryName; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java index e10754ec5..3938ea3ca 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java @@ -32,6 +32,7 @@ public class EmisTransProduct extends BaseEntity { private static final long serialVersionUID = 1L; + /* 序号 */ private Long id; /* 产品代码 */ @@ -40,7 +41,7 @@ public class EmisTransProduct extends BaseEntity private String prodName; /* 英文名称 */ private String prodNameEn; - /* 启用状态 1-启用 0-禁用 */ + /* 启用状态 0-启用 1-停用 */ private Integer status; /* 所属国家 */ private String country; @@ -58,6 +59,8 @@ public class EmisTransProduct extends BaseEntity private Integer minAging; /* 最大时效 */ private Integer maxAging; + /* 显示顺序 */ + private Integer orderNum; private String countryName; diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml index d29b81290..a4740c1bc 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml @@ -22,6 +22,7 @@ + @@ -29,26 +30,29 @@ + + - - select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_line - - + + select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_line + + @@ -101,6 +108,7 @@ apply_scope, logo_type, trans_type, + order_num, remark, tenant_id, del_flag, @@ -108,6 +116,8 @@ create_time, update_by, update_time, + create_site, + update_site, #{id}, @@ -127,6 +137,7 @@ #{applyScope}, #{logoType}, #{transType}, + #{orderNum}, #{remark}, #{tenantId}, #{delFlag}, @@ -134,6 +145,8 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{createSite}, + #{updateSite}, @@ -156,6 +169,7 @@ apply_scope = #{applyScope}, logo_type = #{logoType}, trans_type = #{transType}, + order_num = #{orderNum}, remark = #{remark}, tenant_id = #{tenantId}, del_flag = #{delFlag}, @@ -163,16 +177,18 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, where id = #{id} - delete from emis_trans_line where id = #{id} + update emis_trans_line set del_flag='1' where id = #{id} - delete from emis_trans_line where id in + update emis_trans_line set del_flag='1' where id in #{id} diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml index d4e0b0fb7..aeadc7d8e 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml @@ -12,11 +12,13 @@ + + @@ -24,15 +26,15 @@ + + - - select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_product - + + + select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_product + @@ -92,6 +100,7 @@ aging_desc, min_aging, max_aging, + order_num, remark, tenant_id, del_flag, @@ -99,6 +108,8 @@ create_time, update_by, update_time, + create_site, + update_site, #{id}, @@ -114,6 +125,7 @@ #{agingDesc}, #{minAging}, #{maxAging}, + #{orderNum}, #{remark}, #{tenantId}, #{delFlag}, @@ -121,6 +133,8 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{createSite}, + #{updateSite}, @@ -139,6 +153,7 @@ aging_desc = #{agingDesc}, min_aging = #{minAging}, max_aging = #{maxAging}, + order_num = #{orderNum}, remark = #{remark}, tenant_id = #{tenantId}, del_flag = #{delFlag}, @@ -146,16 +161,18 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, where id = #{id} - delete from emis_trans_product where id = #{id} + update emis_trans_product set del_flag='1' where id = #{id} - delete from emis_trans_product where id in + update emis_trans_product set del_flag='1' where id in #{id}