Commit 503a3a61 authored by KeYong's avatar KeYong

机场bug

parent c900e534
...@@ -2855,7 +2855,6 @@ ...@@ -2855,7 +2855,6 @@
ed.brand, ed.brand,
eq.`name`AS classification, eq.`name`AS classification,
ed.delivery_date AS operationTime, ed.delivery_date AS operationTime,
( (
SELECT SELECT
GROUP_CONCAT(fem.`name`) GROUP_CONCAT(fem.`name`)
...@@ -2871,9 +2870,9 @@ ...@@ -2871,9 +2870,9 @@
LEFT JOIN wl_manufacturer_info mi ON mi.id = ed.manufacturer_id LEFT JOIN wl_manufacturer_info mi ON mi.id = ed.manufacturer_id
LEFT JOIN wl_stock_detail wsd ON wsd.equipment_specific_id = wesp.id LEFT JOIN wl_stock_detail wsd ON wsd.equipment_specific_id = wesp.id
LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
LEFT JOIN wl_equipment_category wec on wec.id=eq.category_id
<where> <where>
wec.industry_code = 2
<if test="dto.code!=null and dto.code!=''"> <if test="dto.code!=null and dto.code!=''">
and wesp.code = #{dto.code} and wesp.code = #{dto.code}
</if> </if>
...@@ -2924,8 +2923,6 @@ ...@@ -2924,8 +2923,6 @@
and wesp.biz_org_code like concat(#{bizOrgCode}, '%') and wesp.biz_org_code like concat(#{bizOrgCode}, '%')
</if> </if>
</where> </where>
</select> </select>
<select id="getSystemAlarmInfoNum" resultType="java.util.Map"> <select id="getSystemAlarmInfoNum" resultType="java.util.Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment