diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java index 9aa217d62..91f8d4d80 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java @@ -47,6 +47,8 @@ public class EmisCommissionQuote extends BaseEntity private String transLineCode; /* 寄件网点 */ private String sendSiteCode; + /* 下一网点 */ + private String nextSiteCode; /* 产品类型代码 */ private String prodCode; /* 起始国 */ @@ -84,8 +86,9 @@ public class EmisCommissionQuote extends BaseEntity /* 产品类型名称 */ private String prodName; - // 寄件网点 + // 寄件网点 下一网点 private String sendSiteName; + private String nextSiteName; private List exprList; diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml index e3b5d415d..694f41bc6 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml @@ -10,6 +10,7 @@ + @@ -29,14 +30,14 @@ - + - select quote_id, quote_code, quote_name, trans_line_code, send_site_code, prod_code, from_country, country, fee_type, calc_type, post_type, trans_type, bl_open, emp_code, emp_name, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_quote + select quote_id, quote_code, quote_name, trans_line_code, send_site_code, next_site_code, prod_code, from_country, country, fee_type, calc_type, post_type, trans_type, bl_open, emp_code, emp_name, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_quote @@ -83,6 +83,7 @@ and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country='' or ( #{country}!='0086' and country='-2' ) ) and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code) and send_site_code is not null ) or send_site_code is null ) + and ( ( FIND_IN_SET(#{nextSiteCode},next_site_code) and next_site_code is not null ) or next_site_code is null ) and fee_type=#{feeType} and calc_type=#{calcType} @@ -130,7 +131,7 @@ @@ -138,10 +139,12 @@ insert into emis_commission_quote + quote_id, quote_code, quote_name, trans_line_code, send_site_code, + next_site_code, prod_code, from_country, country, @@ -166,10 +169,12 @@ update_site, + #{quoteId}, #{quoteCode}, #{quoteName}, #{transLineCode}, #{sendSiteCode}, + #{nextSiteCode}, #{prodCode}, #{fromCountry}, #{country}, @@ -206,6 +211,7 @@ from_country = #{fromCountry}, country = #{country}, send_site_code = #{sendSiteCode}, + next_site_code = #{nextSiteCode}, fee_type = #{feeType}, calc_type = #{calcType},