完善了重点工程AI报警的后续流程:多AI报警处置人时的隐患以及处罚显示不全问题
parent
5bfab38ad4
commit
5b2e87c444
|
@ -316,7 +316,7 @@
|
||||||
LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID
|
LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID
|
||||||
left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR
|
left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR
|
||||||
FROM
|
FROM
|
||||||
( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0') t GROUP BY t.OUTSOURCED_ID ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID
|
( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0') t GROUP BY t.OUTSOURCED_ID,t.CREATOR ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID
|
||||||
where f.ISDELETE = '0'
|
where f.ISDELETE = '0'
|
||||||
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
|
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
|
||||||
and
|
and
|
||||||
|
@ -376,9 +376,10 @@
|
||||||
or f.JURISDICTION_UNIT LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
|
or f.JURISDICTION_UNIT LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
|
||||||
or f.PUNISH_THE_PERSON LIKE CONCAT(CONCAT('%', #{pd.UserId}),'%')
|
or f.PUNISH_THE_PERSON LIKE CONCAT(CONCAT('%', #{pd.UserId}),'%')
|
||||||
or f.CREATOR = #{pd.UserId}
|
or f.CREATOR = #{pd.UserId}
|
||||||
or (h.CREATOR = #{pd.UserId} and h.SOURCE = '1')
|
or (h.CREATOR LIKE CONCAT('%', #{pd.UserId}, '%') and h.SOURCE = '1')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
GROUP BY f.OUTSOURCED_ID
|
||||||
ORDER BY
|
ORDER BY
|
||||||
cc.co DESC,
|
cc.co DESC,
|
||||||
f.OPERATTIME DESC
|
f.OPERATTIME DESC
|
||||||
|
@ -514,7 +515,7 @@
|
||||||
AND f.SOURCE IN ( '4', '5', '1' )
|
AND f.SOURCE IN ( '4', '5', '1' )
|
||||||
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
|
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
|
||||||
and f.ISPUNISH is null
|
and f.ISPUNISH is null
|
||||||
) PUN GROUP BY PUN.OUTSOURCED_ID ) cfsl on cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
|
) PUN GROUP BY PUN.OUTSOURCED_ID,PUN.CREATOR ) cfsl on cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
|
||||||
where f.ISDELETE = '0'
|
where f.ISDELETE = '0'
|
||||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||||
and
|
and
|
||||||
|
@ -529,8 +530,9 @@
|
||||||
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
and (f.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{pd.PUNISHUser} ), '%' ) or (cfsl.SOURCE='1' and cfsl.CREATOR = #{pd.PUNISHUser}))
|
and (f.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{pd.PUNISHUser} ), '%' ) or (cfsl.SOURCE='1' and cfsl.CREATOR LIKE CONCAT('%',#{pd.PUNISHUser},'%') ))
|
||||||
AND f.STATE = '1'
|
AND f.STATE = '1'
|
||||||
|
GROUP BY cfsl.OUTSOURCED_ID
|
||||||
ORDER BY
|
ORDER BY
|
||||||
cfsl.co DESC,
|
cfsl.co DESC,
|
||||||
f.OPERATTIME DESC
|
f.OPERATTIME DESC
|
||||||
|
|
Loading…
Reference in New Issue