Skip to content

A
amos-boot-zx-biz
Commit 07e79ebb authored by zhangsen's avatar zhangsen
Browse files
Options

bug修改

parent cd006ba7
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml
View file @ 07e79ebb
...@@ -19,7 +19,11 @@ ...@@ -19,7 +19,11 @@
'pv' AS stationType, 'pv' AS stationType,
GATEWAY_ID, GATEWAY_ID,
concat(POINT_NAME, '异常') AS pointName, concat(POINT_NAME, '异常') AS pointName,
DISPOSOTION_DATE as disposotionDate DISPOSOTION_DATE as disposotionDate,
(case when WARNING_NAME = '注意' then 1
when WARNING_NAME = '警告' then 2
when WARNING_NAME = '危险' then 3
end) as sort
FROM FROM
idx_biz_pv_warning_record UNION ALL idx_biz_pv_warning_record UNION ALL
SELECT SELECT
...@@ -33,7 +37,11 @@ ...@@ -33,7 +37,11 @@
'fan' AS stationType, 'fan' AS stationType,
GATEWAY_ID, GATEWAY_ID,
concat(POINT_NAME, '异常') AS pointName, concat(POINT_NAME, '异常') AS pointName,
DISPOSOTION_DATE as disposotionDate DISPOSOTION_DATE as disposotionDate,
(case when WARNING_NAME = '注意' then 1
when WARNING_NAME = '警告' then 2
when WARNING_NAME = '危险' then 3
end) as sort
FROM FROM
idx_biz_fan_warning_record idx_biz_fan_warning_record
) a ) a
...@@ -61,7 +69,7 @@ ...@@ -61,7 +69,7 @@
AND concat(#{endDate}, ' 23:59:59') >= a.recDate AND concat(#{endDate}, ' 23:59:59') >= a.recDate
</if> </if>
</where> </where>
order by warningName DESC, recDate DESC order by sort DESC, recDate DESC
limit #{current}, #{size} limit #{current}, #{size}
</select> </select>
......
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