diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml index 4da6da7b3..aae2633af 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml @@ -77,7 +77,7 @@ and quote_id = #{quoteId} and quote_name like concat('%', #{quoteName}, '%') and quote_code like concat('%', #{quoteCode}, '%') - and use_site_code like concat('%', #{useSiteCode}, '%') + and use_site_code=#{useSiteCode} and use_site like concat('%', #{useSite}, '%') and trans_line_code like concat('%', #{transLineCode}, '%') and trans_line like concat('%', #{transLine}, '%') @@ -98,7 +98,7 @@ and send_area_id like concat('%', #{sendAreaId}, '%') and send_area_name like concat('%', #{sendAreaName}, '%') and send_area_site like concat('%', #{sendAreaSite}, '%') - and send_area_site_code like concat('%', #{sendAreaSiteCode}, '%') + and find_in_set(#{sendAreaSiteCode},send_area_site_code) and send_area_site_id like concat('%', #{sendAreaSiteId}, '%') and carries_number like concat('%', #{carriesNumber}, '%') and discards_number like concat('%', #{discardsNumber}, '%') @@ -116,6 +116,20 @@ and update_time = #{updateTime} and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + + + and status=1 + + + and status=0 + + + and endDate now() + + + start_date now() and endDate ]]> now() and status=1 + + order by create_time desc