aike/emis-oms2c-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-12-20 15:46:58 +08:00
parent ca91f16655
commit 74059d8bae
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
View File

@ -18,7 +18,6 @@
<result property="zipCode" column="zip_code" /> <result property="zipCode" column="zip_code" />
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num" />
<!-- <result property="countryName" column="country_name" />--> <!-- <result property="countryName" column="country_name" />-->
<association property="countryName" column="country_code" select="com.xdadan.erp.oms.mapper.EmisBaseMapper.selectCountryNameByCode"/> <association property="countryName" column="country_code" select="com.xdadan.erp.oms.mapper.EmisBaseMapper.selectCountryNameByCode"/>
@ -44,13 +43,22 @@
</if> </if>
<if test="regionNameEn != null and regionNameEn != ''"> <if test="regionNameEn != null and regionNameEn != ''">
and ( and (
region_name like concat('%', #{regionName}, '%') region_name like concat('%', #{regionNameEn}, '%')
or ( region_name_en!='' and region_name_en like concat('%', #{regionName}, '%') ) or ( region_name_en!='' and region_name_en like concat('%', #{regionNameEn}, '%') )
or #{regionName} like concat('%',region_name, '%') or #{regionNameEn} like concat('%',region_name, '%')
or ( region_name_en!='' and #{regionName} like concat('%',region_name_en, '%') ) or ( region_name_en!='' and #{regionNameEn} like concat('%',region_name_en, '%') )
) )
</if> </if>
<if test="searchValue != null and searchValue != ''">
and (
region_name like concat('%', #{searchValue}, '%')
or ( region_name_en!='' and region_name_en like concat('%', #{searchValue}, '%') )
or #{searchValue} like concat('%',region_name, '%')
or ( region_name_en!='' and #{searchValue} like concat('%',region_name_en, '%') )
)
</if>
<if test="regionType != null "> and region_type = #{regionType}</if> <if test="regionType != null "> and region_type = #{regionType}</if>
<if test="shortName != null and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if> <if test="shortName != null and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if>
<if test="parentCode != null and parentCode != ''"> and parent_code=#{parentCode}</if> <if test="parentCode != null and parentCode != ''"> and parent_code=#{parentCode}</if>