Merge branch 'develop_1' into 'develop_master'

Develop 1

See merge request !76
This commit is contained in:
王夏晖
2021-07-30 01:01:28 +00:00
8 changed files with 107 additions and 67 deletions
@@ -27,15 +27,15 @@
and
</if>
<if test="sarFindDto.NYLX != null">
b.NYLX LIKE concat ('%',#{sarFindDto.NYLX,jdbcType=VARCHAR},'%')
b.NYLX LIKE concat ('%',#{sarFindDto.nylx,jdbcType=VARCHAR},'%')
and
</if>
<if test="sarFindDto.ZRBM != null">
b.ZRBM LIKE concat ('%',#{sarFindDto.ZRBM,jdbcType=VARCHAR},'%')
b.ZRBM LIKE concat ('%',#{sarFindDto.zrbm,jdbcType=VARCHAR},'%')
and
</if>
<if test="sarFindDto.SYCPX != null">
b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%')
b.SYCPX LIKE concat ('%',#{sarFindDto.sycpx,jdbcType=VARCHAR},'%')
and
</if>
a.ID IN