From c350ece815a1e2c67d8a74f757c402b28432ff22 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 31 May 2024 04:15:57 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java  | 11 +++++++----
 .../main/resources/mapper/EmisQuotePriceMapper.xml    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 5024f51d4..783e99913 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -912,13 +912,15 @@ public class EmisBaseService {
          queryEmisQuotePrice.setSendAreaSiteCode(sendSiteCode);
          queryEmisQuotePrice.setDispAreaSiteCode(destSiteCode);
 
-         // 客户
-         queryEmisQuotePrice.setCustomerCode(customerCode);
-         queryEmisQuotePrice.setCustNo(custNo);
+
 
          Map existsMap = new HashMap();
          List<EmisQuotePrice> listQuoteValid = new ArrayList<>();
-         // 客户优先级最高
+         // 客户优先级最高,先查询客户特殊报价 客户
+         queryEmisQuotePrice.setQuoteType("3,4");
+         queryEmisQuotePrice.setCustomerCode(customerCode);
+         queryEmisQuotePrice.setCustNo(custNo);
+
          List<EmisQuotePrice> listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
          for (EmisQuotePrice item:listQuoteVip) {
              existsMap.put(item.getFeeType(),"1");
@@ -927,6 +929,7 @@ public class EmisBaseService {
          // 取通用数据排重
          queryEmisQuotePrice.setCustomerCode(null);
          queryEmisQuotePrice.setCustNo(null);
+         queryEmisQuotePrice.setQuoteType("1,2");
          List<EmisQuotePrice> listQuote = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
          for (EmisQuotePrice item:listQuote) {
              if(existsMap.containsKey(item.getFeeType())){
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 797da9dae..b31db3431 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -112,7 +112,7 @@
             <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="quoteType != null  and quoteType != ''"> and quote_type= #{quoteType}</if>
+            <if test="quoteType != null  and quoteType != ''"> and FIND_IN_SET(quote_type,#{quoteType})</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code=#{customerCode}</if>
             <if test="custNo != null  and custNo != ''"> and cust_no=#{custNo}</if>