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
e3b525d3
Commit
e3b525d3
authored
Jun 05, 2023
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug 提交
parent
00d56e00
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+1
-2
No files found.
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
e3b525d3
...
...
@@ -1372,7 +1372,7 @@
<select
id=
"fireAlarmLogPage"
resultType=
"java.util.HashMap"
>
SELECT
`wlesal`.id as alarmLogId,
`wes
i`.equipment_index_name AS
equipment_specific_index_name,
`wes
a`.
equipment_specific_index_name,
`wlesal`.equipment_specific_name,
DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time,
wlesal.location,
...
...
@@ -1384,7 +1384,6 @@
`wl_equipment_specific_alarm_log` `wlesal`
LEFT JOIN `wl_equipment_specific_alarm` wesa ON wesa.id = wlesal.equipment_specific_alarm_id
LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`
LEFT JOIN `wl_equipment_specific_index` `wesi` ON `wesi`.equipment_specific_id = `wles`.`id`
<where>
wesa.`status` = 1 AND wlesal.clean_time IS NULL
<if
test=
"param.system != null and param.system != ''"
>
...
...
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