2022-1-9 异常设备字段排列顺序

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

@@ -59,7 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="selectLabEquipmentVo">
-        SELECT xx.* FROM (
+
+ SELECT xx.* FROM (
         SELECT t1.*,
         (SELECT
         s.name
@@ -91,18 +92,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         UNION ALL
 
-        SELECT t2.*,
+        SELECT t2.id,t2.name,t2.type,t2.`subject_id`,t2.create_time,t2.operate,
         (SELECT
         s.name
         FROM
         lab_subject s
-        WHERE s.id = t2.`subject_id`) subject_name,
-
+        WHERE s.id = t2.`subject_id`) subject_name,t2.dept_id,
         (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
+        WHERE d.dept_id = s.dept_id AND s.id = t2.`subject_id`) dept_name,
+        t2.equipment_type
 
         FROM (
         SELECT so.id,so.name,so.type,
@@ -114,54 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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`,
-          h.`type`,
-          h.`subject_id`,
-          (SELECT
-            s.name
-          FROM
-            lab_subject s
-          WHERE s.id = h.`subject_id`) subject_name,
-          (SELECT
-            s.dept_id
-          FROM
-            lab_subject s
-          WHERE s.id = h.`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 = h.`subject_id`) dept_name,
-          1 equipment_type,
-          h.`create_time`,
-          h.operate
-        FROM
-          lab_hardware h INNER JOIN lab_abnormal a ON a.hardware_id = h.`id`
-
-        UNION ALL
-
-          SELECT DISTINCT so.id,so.name,so.type,
-          so.`subject_id`,
-          (SELECT
-            s.name
-          FROM
-            lab_subject s
-          WHERE s.id = so.`subject_id`) subject_name,
-          so.dept_id,
-          (SELECT
-            d.dept_name
-          FROM
-            sys_dept d,lab_subject s
-          WHERE d.dept_id = s.dept_id AND s.id = so.`subject_id`) dept_name,
-        2 equipment_type,
-        so.`create_time`,
-        so.sense_state operate
-         FROM lab_sensor so INNER JOIN lab_abnormal a ON a.sensor_id = so.`id`
-        )xx
--->
 
   </sql>