|
|
@@ -299,6 +299,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
INNER JOIN lab_violation_score_site vs ON v.`reason` = vs.`violation_name`
|
|
|
where DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
|
|
|
UNION ALL
|
|
|
+ SELECT v.violation_content violation_type, v.`id` num,t.`build_id` dept_dept_id FROM lab_violation v INNER JOIN lab_subject t ON v.subject_id = t.`id`
|
|
|
+ WHERE DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
|
|
|
+ UNION ALL
|
|
|
SELECT '其他' violation_type , v.`id` num,t.`build_id` dept_id
|
|
|
FROM lab_negativelist_history v INNER JOIN lab_subject t ON v.`laboratory_id` = t.`id`
|
|
|
WHERE v.reason NOT IN(
|