配置界面的Cfg Id检索条件 增加范围和in的检索方式的功能修改

This commit is contained in:
shangguanyanfei
2019-04-11 17:13:44 +08:00
parent fc08261929
commit 268a0ae81b
26 changed files with 276 additions and 604 deletions

View File

@@ -308,16 +308,25 @@
<if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
<if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
<foreach collection="compileIdNew.split('-')" index="index" item="item" >
<if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
<foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>