Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
e75a6dbd
Commit
e75a6dbd
authored
Apr 18, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
a8f7307e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+15
-2
No files found.
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
e75a6dbd
...
...
@@ -1003,7 +1003,8 @@
wl_equipment.img eqimg,
wl_equipment_detail.id eqid,
wl_equipment_specific.system_id,
wl_equipment_specific_alarm.create_date alarmTime
-- wl_equipment_specific_alarm.create_date alarmTime
alarm.create_date alarmTime
from wl_equipment_detail
LEFT JOIN wl_equipment_specific ON wl_equipment_specific.equipment_detail_id = wl_equipment_detail.id
LEFT JOIN (select DISTINCT wl_equipment_index.equipment_id from wl_equipment_index where
...
...
@@ -1011,7 +1012,19 @@
LEFT JOIN wl_stock_detail on wl_equipment_detail.id =wl_stock_detail.equipment_detail_id
LEFT JOIN wl_warehouse_structure on wl_stock_detail.warehouse_structure_id = wl_warehouse_structure.id
LEFT JOIN wl_equipment on wl_equipment.id = wl_equipment_detail.equipment_id
LEFT JOIN wl_equipment_specific_alarm on wl_equipment_specific_alarm.equipment_detail_id=wl_equipment_detail.id
-- LEFT JOIN wl_equipment_specific_alarm on wl_equipment_specific_alarm.equipment_detail_id=wl_equipment_detail.id
LEFT JOIN
(select * from wl_equipment_specific_alarm as t
where t.id in
(
select SUBSTRING_INDEX(GROUP_CONCAT(id ORDER BY `create_date` DESC ),',',1) from wl_equipment_specific_alarm
group by equipment_specific_id
)
) alarm on alarm.equipment_detail_id=wl_equipment_detail.id
where wl_equipment.is_iot = 1
)b
)m
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment