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

This commit is contained in:
shangguanyanfei
2019-04-11 11:26:39 +08:00
parent 04a94458ed
commit fc08261929
58 changed files with 844 additions and 106 deletions

View File

@@ -761,6 +761,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -931,6 +941,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="compileGroupMap != null">
and r.COMPILE_ID in
<foreach collection="compileGroupMap.keys" index="index" item="compileId" open="(" separator="," close=")">
@@ -1140,6 +1160,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -1241,6 +1271,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -1539,6 +1579,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -308,6 +308,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -164,6 +164,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -352,6 +352,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -234,6 +234,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -245,6 +245,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -917,6 +927,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -252,6 +252,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -696,6 +706,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -1130,6 +1150,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -1105,6 +1105,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -128,6 +128,16 @@
<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>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="srcIpAddress != null and srcIpAddress != ''">
AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR}
</if>
@@ -638,6 +648,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="srcIpAddress != null and srcIpAddress != ''">
AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR}
</if>

View File

@@ -196,6 +196,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

View File

@@ -215,6 +215,16 @@
<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>
<if test="compileIdNewList !=null">
AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>