添加字段

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrganizationMapper.xml

@@ -69,12 +69,13 @@
     </select>
     <select id="getOrganizationList" resultType="java.util.Map">
         SELECT
-            co.emergency_team_id as groupId,
+            cou.emergency_team_id as groupId,
             co.emergency_team_name as emergencyTeamName,
             cou.member_name as memberName ,
             cou.post_name as  postName,
             cou.telephone,
-            co.duty
+            co.duty,
+            cou.consultation_nub as consultationNub
         FROM
             cb_organization co
                 LEFT JOIN cb_organization_user cou ON co.sequence_nbr = cou.emergency_team_id
@@ -115,7 +116,7 @@
 
     </select>
     <select id="selectMaxSort" resultType="java.lang.Integer">
-        SELECT MAX(sort) FROM cb_organization
+        SELECT IFNULL( MAX(sort),0) FROM cb_organization
     </select>
 
 </mapper>

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -213,6 +213,10 @@
     <select id="selectOilDrainage" resultType="java.util.Map">
         SELECT
             wes.id,
+            '1' as type   ,
+            (SELECT wei.emergency_level FROM  wl_equipment_index wei LEFT JOIN wl_equipment_specific_index wesi  on wei.id = wesi.equipment_index_id
+                WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key) as level,
+            wes.equipment_code as code ,
             wes.name,
             IFNULL(
                     (
@@ -243,6 +247,10 @@
         (
             SELECT
                 wes.id,
+                '2' as type,
+                (SELECT wei.emergency_level FROM  wl_equipment_index wei LEFT JOIN wl_equipment_specific_index wesi  on wei.id = wesi.equipment_index_id
+                 WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key) as level,
+                wes.equipment_code as code ,
                 wes.name,
                 IFNULL(
                         (
@@ -274,6 +282,10 @@
         (
             SELECT
                 wes.id,
+                '3' as type,
+                (SELECT wei.emergency_level FROM  wl_equipment_index wei LEFT JOIN wl_equipment_specific_index wesi  on wei.id = wesi.equipment_index_id
+                 WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key) as level,
+                wes.equipment_code as code ,
                 wes.name,
                 IFNULL(
                         (
@@ -305,6 +317,10 @@
         (
             SELECT
                 wes.id,
+                '4' as type,
+                (SELECT wei.emergency_level FROM  wl_equipment_index wei LEFT JOIN wl_equipment_specific_index wesi  on wei.id = wesi.equipment_index_id
+                 WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key) as level,
+                wes.equipment_code as code ,
                 wes.name,
                 IFNULL(
                         (