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

demand: tms-oa接口-查询客户出货统计-根据客户名称精确匹配 tms-运输管理-货物组批次-批量导入组批次由于模糊匹配导致导入失败问题修复

Browse Source
This commit is contained in:
aike 2026-03-09 16:34:13 +08:00
parent f33f3d3ab4
commit 2d0b00d28b
2 changed files with 15 additions and 5 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>

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

@ -2929,12 +2929,13 @@
<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 != ''">
<choose><when test="customerType != null and customerType != '' and
<choose>
<when test="customerType != null and customerType != '' and
customerType == 1">
and mu.company like concat('%', #{custName}, '%')
</when>
and mu.company =#{custName}
</when>
<otherwise>
and cust_name like concat('%', #{custName}, '%')
and cust_name =#{custName}
</otherwise>
</choose>
</if>