Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
TDLCloud
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
WitCloud
TDLCloud
Commits
aaa7934c
Commit
aaa7934c
authored
Jul 13, 2020
by
Carit Zhu
🎱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add initialValue negative judgement for AlarmLogService.
parent
0038bb64
Pipeline
#445
passed with stage
in 0 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
AlarmLogService.java
src/main/java/com/example/tdl/service/AlarmLogService.java
+2
-2
No files found.
src/main/java/com/example/tdl/service/AlarmLogService.java
View file @
aaa7934c
...
...
@@ -59,7 +59,7 @@ public class AlarmLogService {
}
public
List
<
ResultAlarmLogVo
>
getAlarm
(
AlarmTermVo
alarmTermVo
,
Integer
initialValue
,
Integer
rows
){
return
alarmLogMapper
.
getAlarm
(
alarmTermVo
,
initialValue
,
rows
);
return
alarmLogMapper
.
getAlarm
(
alarmTermVo
,
initialValue
<
0
?
0
:
initialValue
,
rows
);
}
public
Integer
getAlarmWarehouseForCount
(
WarehouseAlarmTermVo
warehouseAlarmTermVo
){
...
...
@@ -67,7 +67,7 @@ public class AlarmLogService {
}
public
List
<
ResultWarehouseAlarmLogVo
>
getAlarmWarehouse
(
WarehouseAlarmTermVo
warehouseAlarmTermVo
,
Integer
initialValue
,
Integer
rows
){
return
alarmLogMapper
.
getAlarmWarehouse
(
warehouseAlarmTermVo
,
initialValue
,
rows
);
return
alarmLogMapper
.
getAlarmWarehouse
(
warehouseAlarmTermVo
,
initialValue
<
0
?
0
:
initialValue
,
rows
);
}
public
List
<
AlarmLogVo
>
getRealTimeAlarm
(
String
companyNo
){
...
...
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