zcloud_gbs
/
zcloud_gbs_hidden_evaluation
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

隐患考评调整

main
zhaokai 2026-04-13 17:14:33 +08:00
parent b63f6f6806
commit 9753ec8a04
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
View File

@ -257,21 +257,23 @@
FROM evaluation_config ec
LEFT JOIN department dep ON ec.department_id = dep.id
LEFT JOIN user usr ON ec.user_id = usr.id
WHERE ec.corpinfo_id = ci.id AND ec.delete_enum = 'FALSE' AND ec.evaluation_type = 1) AS safeEvaluationMember,
WHERE ec.corpinfo_id = ci.id
AND ec.delete_enum = 'FALSE'
AND ec.evaluation_type = 1) AS safeEvaluationMember,
(SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
FROM evaluation_config ec
LEFT JOIN department dep ON ec.department_id = dep.id
LEFT JOIN user usr ON ec.user_id = usr.id
WHERE ec.corpinfo_id = ci.id AND ec.delete_enum = 'FALSE' AND ec.evaluation_type = 2) AS envEvaluationMember
WHERE ec.corpinfo_id = ci.id
AND ec.delete_enum = 'FALSE'
AND ec.evaluation_type = 2) AS envEvaluationMember
FROM (
SELECT DISTINCT
ecorp.corpinfo_id,
ecorp.delete_enum
FROM evaluation_corp ecorp
WHERE ecorp.delete_enum = 'FALSE'
UNION
SELECT DISTINCT
ci.id AS corpinfo_id,
'FALSE' AS delete_enum
@ -289,21 +291,23 @@
AND h.delete_enum = 'FALSE'
AND h.state = 301
AND ((h.source IN (4,5) AND h.final_check = 1) OR h.source NOT IN (4,5))
AND EXISTS (
LEFT JOIN user hu ON h.creator_id = hu.id
LEFT JOIN hidden_evaluation_record her ON h.hidden_id = her.hidden_id AND her.delete_enum = 'FALSE'
WHERE ci.use_flag = 1
<!-- 把 EXISTS 提到这里，解决别名归属问题 -->
AND (
h.hidden_id IS NULL
OR EXISTS (
SELECT 1 FROM evaluation_config ec2
WHERE ec2.corpinfo_id = h.corp_id AND ec2.delete_enum = 'FALSE'
WHERE ec2.corpinfo_id = h.corp_id
AND ec2.delete_enum = 'FALSE'
AND (
(ec2.evaluation_type = 1 AND h.hidden_type IN ('aqyh','rdbaqys','wzcz','wzzh','grfhyp','wdbaqzt','jxsb','hcl','dqsb','gsj','aqbhzz','ss','xf','tzsb','hjdbaqys','zmjdgyxbj','aqbzbs','gkkd','zykjxzzl','eltq','gldqx','wzdhzdlsbdw','wfacs','jypx','aqyh-qt'))
OR
(ec2.evaluation_type = 2 AND h.hidden_type IN ('wshb','hjwr','ws','dq','zs','gf','hjwsjlh','yqfk','wshb-qt'))
)
)
LEFT JOIN user hu ON h.creator_id = hu.id
LEFT JOIN hidden_evaluation_record her
ON h.hidden_id = her.hidden_id
AND her.delete_enum = 'FALSE'
WHERE ci.use_flag = 1
<!-- 原有筛选条件：部门 + 考评人姓名 -->
)
<if test="params.departmentId != null and params.departmentId != ''">
AND configDept.id = #{params.departmentId}
</if>