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

隐患考评调整

main
zhaokai 2026-03-31 15:33:53 +08:00
parent eebfd9df1d
commit 897d49ad09
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,6 @@
GROUP_CONCAT(DISTINCT hiddenUser.id) AS checkUserId,
GROUP_CONCAT(DISTINCT hiddenUser.name) AS checkUserName,
COALESCE(GROUP_CONCAT(DISTINCT CONCAT(d.name, '-', u.name)), '') AS evaluationMembers,
-- 未考评（动态匹配安全/环保类型）
COALESCE(
(SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
FROM evaluation_config ec
@ -92,7 +91,6 @@
WHERE ec.corpinfo_id = h.corp_id
AND ec.delete_enum = 'FALSE'
AND ec.evaluation_type = #{params.evaluationType}
-- 核心：只排除已考评的 user_id
AND usr.id NOT IN (
SELECT DISTINCT hed2.evaluation_user_id
FROM hidden_evaluation_detail hed2
@ -120,7 +118,6 @@
(h.source IN (4,5) AND h.final_check = 1)
OR h.source NOT IN (4,5)
)
-- 前端传入：1=安全类 2=环保类
AND (
( #{params.evaluationType} = 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
@ -225,17 +222,11 @@
SELECT
ci.id AS corpinfoId,
ci.corp_name AS corpinfoName,
-- 完成考评数：有记录 且 结果不是未完成
COUNT(DISTINCT CASE WHEN her.evaluation_result != 1 THEN h.id END) AS completeEvaluationHiddenNum,
-- 待考评数：无记录 或 结果=1
COUNT(DISTINCT CASE WHEN her.id IS NULL OR her.evaluation_result = 1 THEN h.id END) AS waitEvaluationHiddenNum,
-- 涉及奖励人数（隐患快报发现人去重）
COUNT(DISTINCT h.creator_id ) AS involveRewardPersonNum,
-- 已兑换隐患数
COUNT(DISTINCT CASE WHEN her.exchange_flag = 1 THEN h.id END) AS exchangedHiddenNum,
-- 总可兑换隐患数
COUNT(DISTINCT CASE WHEN her.exchange_flag IS NOT NULL and her.evaluation_result=2 and her.exchange_flag = 0 THEN h.id END) AS totalExchangeHiddenNum,
-- 安全类考评成员
(SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
FROM evaluation_config ec
LEFT JOIN department dep ON ec.department_id = dep.id
@ -243,7 +234,6 @@
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
@ -255,7 +245,6 @@
LEFT JOIN corp_info ci ON h.corp_id = ci.id AND ci.delete_enum = 'FALSE'
left join evaluation_corp ecorp ON h.corp_id = ecorp.corpinfo_id AND ecorp.delete_enum = 'FALSE'
LEFT JOIN hidden_evaluation_record her ON h.hidden_id = her.hidden_id AND her.delete_enum = 'FALSE'
-- 关联考评配置，用于查询条件过滤
LEFT JOIN evaluation_config ec ON h.corp_id = ec.corpinfo_id AND ec.delete_enum = 'FALSE'
LEFT JOIN department configDept ON ec.department_id = configDept.id
LEFT JOIN user configUser ON ec.user_id = configUser.id
@ -266,7 +255,6 @@
(h.source IN (4, 5) AND h.final_check = 1)
OR h.source NOT IN (4, 5)
)
-- 安全/环保类型过滤
AND EXISTS (
SELECT 1 FROM evaluation_config ec2
WHERE ec2.corpinfo_id = h.corp_id
@ -277,12 +265,10 @@
(ec2.evaluation_type = 2 AND h.hidden_type IN ('wshb','hjwr','ws','dq','zs','gf','hjwsjlh','yqfk','wshb-qt'))
)
)
<!-- 1. 考核部门查询条件 -->
<if test="params.departmentId != null and params.departmentId != ''">
AND configDept.id = #{params.departmentId}
</if>
<!-- 2. 考核部门人员查询条件（模糊查询） -->
<if test="params.userName != null and params.userName != ''">
AND configUser.name LIKE CONCAT('%', #{params.userName}, '%')
</if>