marger修复

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -86,14 +86,14 @@
     </select>
     <select id="getFireEquiments" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpeVo">
         select
-            sto.id as id ,
+        sto.equipment_specific_id as id ,
         equ.code as f_code,
         det.name as f_name
         from
         wl_stock_detail as sto
         left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
         left join wl_equipment as equ on det.equipment_id = equ.id
-            left join f_equipment_fire_equipment as fire on sto.id = fire.fire_equipment_id
+        left join f_equipment_fire_equipment as fire on sto.equipment_specific_id = fire.fire_equipment_id
         where sto.amount <![CDATA[>]]> 0
         <if test="fname != null and fname!='null' ">
             and det.name like CONCAT('%',#{fname},'%' )
@@ -119,9 +119,9 @@
             d.important_equipment_id = #{importantEquipId}  ) isBound
             from
             f_equipment_fire_equipment as fire
-                left join wl_stock_detail as sto on fire.fire_equipment_id = sto.id
+            left join wl_stock_detail as sto on fire.fire_equipment_id = sto.equipment_specific_id
             left join wl_equipment_specific as spe on sto.qr_code  = spe.qr_code
-                left join wl_equipment_specific_index as speind on spe.id = speind.equipment_specific_id
+            left join wl_equipment_specific_index as speind on sto.equipment_specific_id = speind.equipment_specific_id
             left join wl_equipment_index as equindex on speind.equipment_index_id = equindex.id
             where equindex.type_code ='BREAKDOWN'
             <if test="importantEquipId != null  ">