数据大屏分级管控接口

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabGradeManageRecordMapper.xml

@@ -261,18 +261,23 @@
     <select id="queryManageWorkChartDetailsType2"
             resultType="com.zd.laboratory.domain.vo.LabManageWorkChartVo">
         SELECT DISTINCT
-            s.id AS subId,
-            s.NAME AS subName,
-            ifnull( sc.classified_name, "" ) AS levelName,
-            ifnull( st.type_name, "" ) AS typeName,
-            d.dept_name as deptName
+        s.id AS subId,
+        s.NAME AS subName,
+        sc.classified_name AS levelName,
+        st.type_name AS typeName,
+        d.dept_name as deptName
         FROM
-            lab_grade_manage AS m
-                LEFT JOIN lab_subject s ON find_in_set( s.id, m.sub_ids )
-                LEFT JOIN lab_safe_classified sc ON s.LEVEL = sc.id
-                LEFT JOIN lab_safe_classtype st ON s.type_id = st.id
-                left join sys_dept d on s.dept_id = d.dept_id
+        lab_grade_manage AS m
+        LEFT JOIN lab_subject s on m.dept_id = s.dept_id
+        LEFT JOIN lab_safe_classified sc ON s.LEVEL = sc.id
+        LEFT JOIN lab_safe_classtype st ON s.type_id = st.id
+        left join sys_dept d on s.dept_id = d.dept_id
         <where>
+            m.status = 1 and (
+            (m.level = s.level or m.`level` is null)
+            and (m.type_id = s.type_id or m.type_id is null)
+            and (m.mold_id = s.mold_id or m.mold_id is null)
+            )
             <if test="deptId != null">
                 and s.dept_id = #{deptId}
             </if>