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

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/95
This commit is contained in:
heyu 2025-07-07 11:05:22 +08:00
commit 28a175740c

View File

@ -190,7 +190,8 @@
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="blEntering != null and blEntering != ''"> and bl_entering=#{blEntering}</if>
<if test="blEntering==1"> and bl_entering=#{blEntering}</if>
<if test="blEntering==-1"> and bl_entering='0'</if>
<if test="searchValue != null and searchValue != '' ">
and ( batch_no like concat('%', #{searchValue},'%') or batch_name like concat('%', #{searchValue},'%') or car_no like concat('%', #{searchValue},'%') )
@ -265,7 +266,8 @@
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="blEntering != null and blEntering != ''"> and bl_entering=#{blEntering}</if>
<if test="blEntering==1"> and bl_entering=#{blEntering}</if>
<if test="blEntering==-1"> and bl_entering='0'</if>
<if test="searchValue != null and searchValue != '' ">
and ( batch_no like concat('%', #{searchValue},'%') or batch_name like concat('%', #{searchValue},'%') or car_no like concat('%', #{searchValue},'%') )