Merge remote-tracking branch 'origin/pet' into pet
commit
4ac8d2a6cc
|
@ -1136,7 +1136,6 @@
|
||||||
from
|
from
|
||||||
<include refid="tableName"></include> f
|
<include refid="tableName"></include> f
|
||||||
left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
|
left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
|
||||||
left join `qa-gwj-regulatory`.bus_aiwarning ai on ai.HIDDEN_IDS like CONCAT('%',f.HIDDEN_ID,'%')
|
|
||||||
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
|
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
|
||||||
left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
|
left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
|
||||||
left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
|
left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
|
||||||
|
@ -1146,8 +1145,15 @@
|
||||||
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
|
left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
|
||||||
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
|
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
|
||||||
where f.ISDELETE = '0'
|
where f.ISDELETE = '0'
|
||||||
<if test="AIWARNING_ID != null and AIWARNING_ID !=''" >
|
<if test="FOREIGN_ID != null and FOREIGN_ID !=''" >
|
||||||
and ai.AIWARNING_ID = #{AIWARNING_ID}
|
and f.FOREIGN_ID = #{FOREIGN_ID}
|
||||||
|
</if>
|
||||||
|
<!-- Ai报警信息专查 -->
|
||||||
|
<if test="AI_WARNING != null and AI_WARNING !=''" >
|
||||||
|
and f.HIDDEN_ID in
|
||||||
|
<foreach collection="array" item="item" separator="," open="(" close = ")">
|
||||||
|
#{item}
|
||||||
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
|
<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
|
||||||
and
|
and
|
||||||
|
@ -1557,7 +1563,7 @@
|
||||||
WHERE
|
WHERE
|
||||||
f.ISDELETE = '0'
|
f.ISDELETE = '0'
|
||||||
AND f.SOURCE = '1'
|
AND f.SOURCE = '1'
|
||||||
AND f.CREATOR = #{loginUserId}
|
AND f.CREATOR LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
|
||||||
and f.ISPUNISH is null
|
and f.ISPUNISH is null
|
||||||
) t ) as HIDDEN_COUNT,
|
) t ) as HIDDEN_COUNT,
|
||||||
( SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM (
|
( SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM (
|
||||||
|
|
Loading…
Reference in New Issue