Merge branch 'develop_dl_jiangxi' into develop_dl

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

@@ -133,8 +133,7 @@
             resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
         SELECT wesi.id                 AS id,
                wei.name_key            AS nameKey,
-               IFNULL(si.value_label, si.`value`) AS 'value',
-               wesi.equipment_specific_id AS equipmentSpecificId,
+               IFNULL(si.value_label, si.`value`) AS 'value', wesi.equipment_specific_id AS equipmentSpecificId,
                wesi.equipment_index_id AS equipmentIndexId,
                wes.org_code            AS code,
                wes.iot_code            AS iotCode,
@@ -180,11 +179,9 @@
                wled.id                                       equip_detail_id,
                wles.qr_code,
                wles.CODE,
-               (
-                   select GROUP_CONCAT(fs.name)
+               (select GROUP_CONCAT(fs.name)
                 from f_fire_fighting_system fs
-                   where FIND_IN_SET(fs.id, wles.system_id)
-               ) as           System_name,
+                where FIND_IN_SET(fs.id, wles.system_id)) as System_name,
                wlec.NAME                                     category_name,
                wlws.full_name                                warehouse_name,
                wled.standard,
@@ -209,13 +206,11 @@
                  LEFT JOIN wl_warehouse_structure wlws ON wlsd.warehouse_structure_id = wlws.id
                  LEFT JOIN wl_unit wlun ON wle.unit_id = wlun.id
                  LEFT JOIN wl_manufacturer_info wlmi ON wlmi.id = wled.manufacturer_id
-                 LEFT JOIN (
-            SELECT wlei.equipment_id,
+                 LEFT JOIN (SELECT wlei.equipment_id,
                                    wlesi.`value`
                             FROM wl_equipment_index wlei
                                      LEFT JOIN wl_equipment_specific_index wlesi ON wlei.id = wlesi.equipment_index_id
-            WHERE wlei.name_key = 'runState'
-        ) wleias ON wle.id = wleias.equipment_id
+                            WHERE wlei.name_key = 'runState') wleias ON wle.id = wleias.equipment_id
         WHERE wles.id = #{id}
     </select>
     <select id="selectEquProperty" resultType="java.util.HashMap">
@@ -480,7 +475,7 @@
         wes.position,
         wes.name,
         we.expiry_date as weExpiry,
-<!--               wed.expiry_date     as wesExpiry,-->
+        <!--               wed.expiry_date     as wesExpiry,-->
         wed.area as area,
         wed.production_date as product
         from wl_equipment_specific wes
@@ -532,7 +527,7 @@
         wei.type_code AS typeCode,
         wei.type_name AS typeName,
         wei.name AS indexName,
-	           wei.unit AS indexUnitName,
+        wesi.unit AS indexUnitName,
         wes.org_code AS orgCode,
         ed.`name` AS equipmentSpecificName,
         ed.equipment_name AS equipmentName,