Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 3cf71a99 authored by zhangsen's avatar zhangsen
Browse files
Options

bug修改

parent e73b0a61
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 38 deletions
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/ContingencyPlanInstanceMapper.xml
View file @ 3cf71a99
......@@ -83,7 +83,6 @@
select * from (
(SELECT
r.`name`,
ou.`code`,
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(
......@@ -128,21 +127,19 @@
END
) AS levelStatus,
IFNULL( rp.volume, 0 ) AS volume,
<!-- ec.image,-->
ec.image,
r.resource_type,
r.sequence_nbr
FROM
cb_water_resource r
LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
AND ou.is_delete = 0
LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
LEFT JOIN wl_equipment_specific_index ei ON ei.equipment_specific_id = rp.level_device_id
<!-- LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id-->
<!-- LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id-->
LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
WHERE
r.resource_type = 'industryPool'
AND r.is_delete = 1
AND ou.`code` IS NOT NULL
AND r.`biz_org_code` IS NOT NULL
<if test="bizOrgCode!=null and bizOrgCode!=''">
AND r.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
......@@ -151,7 +148,6 @@
(
SELECT
a.`name`,
a.`code`,
a.minLevel,
a.maxLevel,
(
......@@ -182,7 +178,7 @@
)
END
) AS levelAbs,
a.nowLevel,
IFNULL( a.nowLevel, '--' ) nowLevel,
(
CASE
......@@ -196,15 +192,13 @@
END
) AS levelStatus,
a.volume,
<!-- a.image,-->
a.image,
a.resource_type,
a.sequence_nbr
<!-- ,a.`code` AS systemCode-->
FROM
(
SELECT
r.`name`,
ou.`code`,
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(select
......@@ -215,22 +209,19 @@
(ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel,
IFNULL( rp.volume, 0 ) AS volume,
<!-- ec.image,-->
ec.image,
r.resource_type,
r.sequence_nbr,
rp.level_device_id
<!-- ,fs.`code` AS systemCode-->
FROM
cb_water_resource r
LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
AND ou.is_delete = 0
LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
<!-- LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id-->
<!-- LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id-->
LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
WHERE
r.resource_type = 'pool'
AND r.is_delete = 1
AND ou.`code` IS NOT NULL
AND r.`biz_org_code` IS NOT NULL
<if test="bizOrgCode!=null and bizOrgCode!=''">
AND r.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
......@@ -245,9 +236,9 @@
<select id="countWater" resultType="long">
select count(1) from (
select * from (
(SELECT
r.`name`,
ou.`code`,
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(
......@@ -292,21 +283,19 @@
END
) AS levelStatus,
IFNULL( rp.volume, 0 ) AS volume,
<!-- ec.image,-->
ec.image,
r.resource_type,
r.sequence_nbr
FROM
cb_water_resource r
LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
AND ou.is_delete = 0
LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
LEFT JOIN wl_equipment_specific_index ei ON ei.equipment_specific_id = rp.level_device_id
<!-- LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id-->
<!-- LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id-->
LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
WHERE
r.resource_type = 'industryPool'
AND r.is_delete = 1
AND ou.`code` IS NOT NULL
AND r.`biz_org_code` IS NOT NULL
<if test="bizOrgCode!=null and bizOrgCode!=''">
AND r.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
......@@ -315,7 +304,6 @@
(
SELECT
a.`name`,
a.`code`,
a.minLevel,
a.maxLevel,
(
......@@ -346,7 +334,7 @@
)
END
) AS levelAbs,
a.nowLevel,
IFNULL( a.nowLevel, '--' ) nowLevel,
(
CASE
......@@ -360,15 +348,13 @@
END
) AS levelStatus,
a.volume,
<!-- a.image,-->
a.image,
a.resource_type,
a.sequence_nbr
<!-- ,a.`code` AS systemCode-->
FROM
(
SELECT
r.`name`,
ou.`code`,
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(select
......@@ -379,22 +365,19 @@
(ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel,
IFNULL( rp.volume, 0 ) AS volume,
<!-- ec.image,-->
ec.image,
r.resource_type,
r.sequence_nbr,
rp.level_device_id
<!-- ,fs.`code` AS systemCode-->
FROM
cb_water_resource r
LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
AND ou.is_delete = 0
LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
<!-- LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id-->
<!-- LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id-->
LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
WHERE
r.resource_type = 'pool'
AND r.is_delete = 1
AND ou.`code` IS NOT NULL
AND r.`biz_org_code` IS NOT NULL
<if test="bizOrgCode!=null and bizOrgCode!=''">
AND r.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
......@@ -402,5 +385,8 @@
r.sequence_nbr
) a
)) b
ORDER BY
levelStatus DESC,sequence_nbr DESC
) b
</select>
</mapper>
\ No newline at end of file
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