AI报警-修复了AI报警查看隐患详情不回显的问题
parent
27d0fbcccf
commit
dfa5786ef3
|
@ -250,7 +250,6 @@ public class AIWarningController extends BaseController {
|
||||||
if (user != null) {
|
if (user != null) {
|
||||||
pd.put("NAME", user.getString("name"));
|
pd.put("NAME", user.getString("name"));
|
||||||
}
|
}
|
||||||
pd.put("FOREIGN_ID", pd.getString("AIWARNING_ID"));
|
|
||||||
pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd));
|
pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd));
|
||||||
map.put("pd", pd);
|
map.put("pd", pd);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
|
|
|
@ -1136,6 +1136,7 @@
|
||||||
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'
|
||||||
|
@ -1145,15 +1146,8 @@
|
||||||
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="FOREIGN_ID != null and FOREIGN_ID !=''" >
|
<if test="AIWARNING_ID != null and AIWARNING_ID !=''" >
|
||||||
and f.FOREIGN_ID = #{FOREIGN_ID}
|
and ai.AIWARNING_ID = #{AIWARNING_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
|
||||||
|
@ -1626,6 +1620,9 @@ FROM
|
||||||
and P.HANDLED = '1'
|
and P.HANDLED = '1'
|
||||||
</if>
|
</if>
|
||||||
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
|
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
|
||||||
|
<if test="pd.CREATOR != null and pd.CREATOR != ''">
|
||||||
|
and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end)
|
||||||
|
</if>
|
||||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||||
and
|
and
|
||||||
(
|
(
|
||||||
|
|
Loading…
Reference in New Issue