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

Merge pull request 'develop' (#323) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/323
This commit is contained in:
heyu 2026-03-09 16:45:59 +08:00
commit 54e19b0f83
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
View File

@ -265,7 +265,16 @@
<where>
<if test="id != null "> and id = #{id}</if>
<if test="siteCode != null and siteCode != ''"> and FIND_IN_SET(`site_code`,#{siteCode}) </if>
<if test="siteName != null and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
<if test="siteName != null and siteName != ''">
<choose>
<when test="params != null and params.blExactMatch != null and (params.blExactMatch == 1 or params.blExactMatch == '1')">
and site_name = #{siteName}
</when>
<otherwise>
and site_name like concat('%', #{siteName}, '%')
</otherwise>
</choose>
</if>
<if test="siteNameEn != null and siteNameEn != ''"> and site_name_en like concat('%', #{siteNameEn}, '%')</if>
<if test="defaultCurrency != null and defaultCurrency != ''"> and default_currency like concat('%', #{defaultCurrency}, '%')</if>
<if test="cutOffTime != null and cutOffTime != ''"> and cut_off_time like concat('%', #{cutOffTime}, '%')</if>

12
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -2928,7 +2928,17 @@
<if test="paymentType != null and paymentType != ''"> and FIND_IN_SET(payment_type,#{paymentType})</if>
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
<if test="custName != null and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
<if test="custName != null and custName != ''">
<choose>
<when test="customerType != null and customerType != '' and
customerType == 1">
and mu.company =#{custName}
</when>
<otherwise>
and cust_name =#{custName}
</otherwise>
</choose>
</if>
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
<if test="productType != null and productType != ''"> and FIND_IN_SET(product_type,#{productType})</if>
<if test="timeType != null and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>