guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into dev

liujun0703-新项目开发
liujun 2024-05-15 21:36:45 +08:00
parent 731a3de934 13a2dea7e7
commit e4a10cf1c7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
View File

@ -1136,7 +1136,6 @@
from
<include refid="tableName"></include> f
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> ht on f.HIDDENTYPE = ht.BIANMA
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_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
where f.ISDELETE = '0'
<if test="AIWARNING_ID != null and AIWARNING_ID !=''" >
and ai.AIWARNING_ID = #{AIWARNING_ID}
<if test="FOREIGN_ID != null and FOREIGN_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 test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
and