aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-31 04:47:37 +08:00
parent 58b4543000
commit 0a99d31c8f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -916,16 +916,19 @@ public class EmisBaseService {
Map existsMap = new HashMap(); Map existsMap = new HashMap();
List<EmisQuotePrice> listQuoteValid = new ArrayList<>(); List<EmisQuotePrice> listQuoteValid = new ArrayList<>();
if(!StringUtils.isEmpty(customerCode) || !StringUtils.isEmpty(custNo)) {
// 客户优先级最高,先查询客户特殊报价 客户 // 客户优先级最高,先查询客户特殊报价 客户
queryEmisQuotePrice.setQuoteType("3,4"); queryEmisQuotePrice.setQuoteType("3,4");
queryEmisQuotePrice.setCustomerCode(customerCode); queryEmisQuotePrice.setCustomerCode(customerCode);
queryEmisQuotePrice.setCustNo(custNo); queryEmisQuotePrice.setCustNo(custNo);
List<EmisQuotePrice> listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice); List<EmisQuotePrice> listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
for (EmisQuotePrice item:listQuoteVip) { for (EmisQuotePrice item : listQuoteVip) {
existsMap.put(item.getFeeType(),"1"); existsMap.put(item.getFeeType(), "1");
listQuoteValid.add(item); listQuoteValid.add(item);
} }
}
// 取通用数据排重 // 取通用数据排重
queryEmisQuotePrice.setCustomerCode(null); queryEmisQuotePrice.setCustomerCode(null);
queryEmisQuotePrice.setCustNo(null); queryEmisQuotePrice.setCustNo(null);

9
emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
View File

@ -114,13 +114,14 @@
<if test="quoteCode != null and quoteCode != ''"> and quote_code=#{quoteCode}</if> <if test="quoteCode != null and quoteCode != ''"> and quote_code=#{quoteCode}</if>
<if test="transLineCode != null and transLineCode != ''"> and trans_line_code=#{transLineCode}</if> <if test="transLineCode != null and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
<if test="quoteType != null and quoteType != ''"> and FIND_IN_SET(quote_type, #{quoteType})</if>
<if test="quoteType != null and (quoteType == '3' or quoteType == '4' or quoteType == '3,4')"> <if test="customerCode != null and customerCode != ''">
and ( ( cust_no is not null and cust_no=#{custNo} ) or ( customer_code is not null and customer_code=#{customerCode} ) ) and customer_code=#{customerCode}
</if> </if>
<if test="quoteType != null and (quoteType == '1' or quoteType == '2' or quoteType == '1,2')"> <if test="custNo != null and custNo != ''">
and cust_no is not null and customer_code is not null and cust_no=#{custNo}
</if> </if>
<if test="feeType != null and feeType != ''"> and fee_type=#{feeType}</if> <if test="feeType != null and feeType != ''"> and fee_type=#{feeType}</if>