diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
index a4ee8b8..14ea72a 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
@@ -300,28 +300,24 @@
u.department_id as departmentId,
d.name AS departmentName,
p.post_name AS postName,
- -- 奖励总得分:可兑换的隐患总数(二次验收通过的)
COUNT(DISTINCT CASE WHEN her.evaluation_result=2 THEN h.id END) AS totalScore,
- -- 已兑换分数:exchange_flag=1
COUNT(DISTINCT CASE WHEN her.exchange_flag = 1 THEN h.id END) AS exchangedScore,
- -- 未兑换分数:exchange_flag=0
COUNT(DISTINCT CASE WHEN her.exchange_flag = 0 and her.evaluation_result=2 THEN h.id END) AS notExchangedScore
-
FROM hidden h
- -- 发现人
LEFT JOIN user u ON h.creator_id = u.id
LEFT JOIN department d ON u.department_id = d.id
left join post p ON u.post_id = p.id
left join corp_info ci ON h.corp_id = ci.id AND ci.delete_enum = 'FALSE'
LEFT JOIN hidden_evaluation_record her ON h.hidden_id = her.hidden_id AND her.delete_enum = 'FALSE'
WHERE h.delete_enum = 'FALSE'
- AND h.corp_id = #{params.corpinfoId}
- AND h.state = 301 -- 已验收
- -- 来源4/5必须满足final_check=1,其他只需要state=301
+ AND h.state = 301
AND (
(h.source IN (4,5) AND h.final_check = 1)
OR h.source NOT IN (4,5)
)
+
+ AND h.corp_id = #{params.corpinfoId}
+
AND d.id = #{params.departmentId}