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
99583f93
Commit
99583f93
authored
Apr 15, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除追加
parent
16813688
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
EquipmentSpecificAlarmController.java
...ipmanage/controller/EquipmentSpecificAlarmController.java
+4
-4
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificAlarmController.java
View file @
99583f93
...
...
@@ -135,10 +135,10 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
public
ResponseModel
getAlarmPage
(
int
pageNum
,
int
pageSize
,
AlarmDTO
dto
)
{
dto
.
setStatus
(
"1"
);
Page
page
=
new
Page
(
pageNum
,
pageSize
);
if
(
dto
.
getStartDate
()
!=
null
&&
dto
.
getEndDate
()
!=
null
){
dto
.
setStartDate
(
dto
.
getStartDate
().
split
(
" "
)[
0
]+
" 00:00:00"
);
dto
.
setEndDate
(
dto
.
getEndDate
().
split
(
" "
)[
0
]+
" 23:59:59"
);
}
//
if (dto.getStartDate() != null && dto.getEndDate() != null){
//
dto.setStartDate(dto.getStartDate().split(" ")[0]+" 00:00:00");
//
dto.setEndDate(dto.getEndDate().split(" ")[0]+" 23:59:59");
//
}
Page
<
EquipSpecificAlarmDTO
>
pageBean
=
iEquipmentSpecificAlarmService
.
getAlarmPage
(
page
,
dto
);
return
CommonResponseUtil
.
success
(
pageBean
);
}
...
...
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