gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -761,16 +761,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>
@@ -941,16 +950,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="compileGroupMap != null">
and r.COMPILE_ID in
<foreach collection="compileGroupMap.keys" index="index" item="compileId" open="(" separator="," close=")">
@@ -1160,16 +1178,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>
@@ -1271,16 +1298,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>
@@ -1579,16 +1615,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>

19
src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
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>

19
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -164,16 +164,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

19
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -352,16 +352,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>

19
src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
View File

@@ -234,16 +234,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

38
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -245,16 +245,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -927,16 +936,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

57
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -252,16 +252,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -706,16 +715,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -1150,16 +1168,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

19
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -1105,16 +1105,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

38
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -128,15 +128,24 @@
<if test="compileId != null">
AND r.compile_id=#{compileId,jdbcType=BIGINT}
</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="srcIpAddress != null and srcIpAddress != ''">
AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR}
@@ -648,15 +657,24 @@
<if test="compileId != null">
AND a.compile_id=#{compileId,jdbcType=BIGINT}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="srcIpAddress != null and srcIpAddress != ''">
AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR}

19
src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
View File

@@ -196,16 +196,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

19
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -215,16 +215,25 @@
<if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND a.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 a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if>
<if test="compileIdNewList !=null">
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.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 a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>