Commit bec73f84 authored by suhuiguang's avatar suhuiguang

1.消防装备与消防系统关系调整未1对多

parent 7f39bb56
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
spe.iot_code, spe.iot_code,
spe.code as specific_code, spe.code as specific_code,
spe.system_id, spe.system_id,
manage.name as system_name (select group_concat(manage.name) FROM `f_fire_fighting_system` as manage where spe.system_id = manage.id) as system_name
from from
( (
SELECT amount, SELECT amount,
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
left join wl_equipment_detail as det on sto.equipment_detail_id = det.id 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 wl_equipment as equ on det.equipment_id = equ.id
left join wl_equipment_category as cate on equ.category_id = cate.id left join wl_equipment_category as cate on equ.category_id = cate.id
left join f_fire_fighting_system as manage on spe.system_id = manage.id
where sto.amount <![CDATA[>]]> 0 where sto.amount <![CDATA[>]]> 0
and spe.id is not null and spe.id is not null
<if test="name != null and name!='null' "> <if test="name != null and name!='null' ">
...@@ -94,7 +93,6 @@ ...@@ -94,7 +93,6 @@
left join wl_equipment_detail as det on sto.equipment_detail_id = det.id 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 wl_equipment as equ on det.equipment_id = equ.id
left join wl_equipment_category as cate on equ.category_id = cate.id left join wl_equipment_category as cate on equ.category_id = cate.id
left join f_fire_fighting_system as manage on spe.system_id = manage.id
where sto.amount <![CDATA[>]]> 0 where sto.amount <![CDATA[>]]> 0
and spe.id is not null and spe.id is not null
<if test="name != null and name!='null' "> <if test="name != null and name!='null' ">
......
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