Merge commit '62df10ea5a86857d86a8b4cc86f86d77fc62d079' into suda

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

@@ -60,6 +60,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectLabEquipmentVo">
         SELECT xx.* FROM (
+        SELECT t1.*,
+        (SELECT
+        s.name
+        FROM
+        lab_subject s
+        WHERE s.id = t1.`subject_id`) subject_name,
+        (SELECT
+        s.dept_id
+        FROM
+        lab_subject s
+        WHERE s.id = t1.`subject_id`) dept_id,
+        (SELECT
+        d.dept_name
+        FROM
+        sys_dept d,lab_subject s
+        WHERE d.dept_id = s.dept_id AND s.id = t1.`subject_id`) dept_name,
+        1 equipment_type
+        FROM (
+        SELECT
+        h.id,
+        h.`name`,
+        h.`type`,
+        h.`subject_id`,
+        h.`create_time`,
+        h.operate
+        FROM
+        lab_hardware h INNER JOIN (SELECT DISTINCT al.hardware_id FROM lab_abnormal al) a ON a.hardware_id = h.`id`
+        )t1
+
+        UNION ALL
+
+        SELECT t2.*,
+        (SELECT
+        s.name
+        FROM
+        lab_subject s
+        WHERE s.id = t2.`subject_id`) subject_name,
+
+        (SELECT
+        d.dept_name
+        FROM
+        sys_dept d,lab_subject s
+        WHERE d.dept_id = s.dept_id AND s.id = t2.`subject_id`) dept_name
+
+        FROM (
+        SELECT so.id,so.name,so.type,
+        so.`subject_id`,
+        2 equipment_type,
+        so.`create_time`,
+        so.dept_id,
+        so.sense_state operate
+        FROM lab_sensor so INNER JOIN (SELECT DISTINCT al.sensor_id FROM lab_abnormal al) a ON a.sensor_id = so.`id`
+        )t2
+        )xx
+        <!--SELECT xx.* FROM (
         SELECT DISTINCT
           h.id,
           h.`name`,
@@ -106,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         so.sense_state operate
          FROM lab_sensor so INNER JOIN lab_abnormal a ON a.sensor_id = so.`id`
         )xx
-
+-->
 
   </sql>