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
ede010fd
Commit
ede010fd
authored
May 09, 2024
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 告警列表增加“systemCode”字段以及时间筛选bug处理
parent
2c773676
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
EmergencyMapper.xml
...ystem-equip/src/main/resources/mapper/EmergencyMapper.xml
+5
-4
No files found.
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @
ede010fd
...
...
@@ -1420,6 +1420,7 @@
IF (wlesal.clean_time IS NOT NULL, '已消除', '未消除' ) cleanStatus,
wlesal.equipment_index_id AS fireEquipmentIndexId,
wlesal.equipment_specific_code AS code,
fs.code AS systemCode,
wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
wlesal.emergency_level_color AS emergencyLevelColor,
...
...
@@ -1454,11 +1455,11 @@
<if
test=
'createDate != null and createDate == "1"'
>
AND wlesal.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
</if>
<if
test=
'startDate != null and startDate == ""'
>
AND wlesal.create_date >= DATE_FORMAT(
$
{startDate}, '%Y-%m-%d %H:%i:%s' )
<if
test=
"startDate != null and startDate != ''"
>
AND wlesal.create_date >= DATE_FORMAT(
#
{startDate}, '%Y-%m-%d %H:%i:%s' )
</if>
<if
test=
'endDate != null and endDate == ""'
>
AND DATE_FORMAT(
$
{endDate}, '%Y-%m-%d %H:%i:%s' ) >= wlesal.create_date
<if
test=
"endDate != null and endDate != ''"
>
AND DATE_FORMAT(
#
{endDate}, '%Y-%m-%d %H:%i:%s' ) >= wlesal.create_date
</if>
<if
test=
"systemCode != null and systemCode != ''"
>
and fs.code = #{systemCode}
...
...
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