Commit 8790c862 authored by maoying's avatar maoying

解决冲突

parents 6e70fc3b 902aedbf
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
END AS type, END AS type,
wlesa.update_date as createDate, wlesa.update_date as createDate,
wlesa.recovery_date as recoveryDate, wlesa.recovery_date as recoveryDate,
wws.full_name as warehouseStructureName, CONCAT(IFNULL(wws.full_name,''),' ',IFNULL(wlsd.description,'')) as warehouseStructureName,
( (
SELECT SELECT
group_concat(DISTINCT f.`name`) group_concat(DISTINCT f.`name`)
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
manage.name as system_name manage.name as system_name
from from
wl_stock_detail as sto wl_stock_detail as sto
left join wl_equipment_specific as spe on sto.qr_code = spe.qr_code left join wl_equipment_specific as spe on sto.equipment_specific_id = spe.id
<if test="equipmentId != null and equipmentId!='null' "> <if test="equipmentId != null and equipmentId!='null' ">
left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id
</if> </if>
......
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
WHEN 'false' THEN '否' WHEN 'false' THEN '否'
ELSE ind.value END 'e_value', ELSE ind.value END 'e_value',
ein.unit as eq_point_unit, ein.unit as eq_point_unit,
str.full_name as source_name, CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
( (
SELECT SELECT
group_concat(DISTINCT f.`name`) group_concat(DISTINCT f.`name`)
......
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