Merge pull request 'demand: 新增筛选网点接口。筛选供应商接口返回nameEn.' (#68) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/68
This commit is contained in:
commit
56c444522b
@ -773,6 +773,8 @@
|
||||
<if test="params.startSiteCode != null and params.startSiteCode != ''">and r.start_site_code =
|
||||
#{params.startSiteCode}
|
||||
</if>
|
||||
<if test="siteCode != null and siteCode != ''"> and r.next_site_code = #{siteCode}</if>
|
||||
<if test="siteName != null and siteName != ''"> and s.site_name LIKE CONCAT('%', #{siteName}, '%')</if>
|
||||
</where>
|
||||
order by r.id desc
|
||||
</select>
|
||||
|
||||
@ -273,6 +273,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
r.del_flag = '0'
|
||||
<if test="params.startSiteCode != null and params.startSiteCode != ''"> and r.start_site_code = #{params.startSiteCode}</if>
|
||||
<if test="params.nextSiteCode != null and params.nextSiteCode != ''"> and r.next_site_code = #{params.nextSiteCode}</if>
|
||||
<if test="code != null and code != ''"> and ( FIND_IN_SET(#{code},r.supplier_code) )</if>
|
||||
<if test="name != null and name != ''">
|
||||
and EXISTS (
|
||||
SELECT 1 FROM emis_supplier s
|
||||
WHERE FIND_IN_SET(s.code, r.supplier_code)
|
||||
AND s.del_flag = '0'
|
||||
AND s.name LIKE CONCAT('%', #{name}, '%')
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
order by id desc
|
||||
</select>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user