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
1cebd933
Commit
1cebd933
authored
Oct 15, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
d4e9c15b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
AlertCalledController.java
...boot/module/jcs/biz/controller/AlertCalledController.java
+9
-7
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java
View file @
1cebd933
...
...
@@ -148,16 +148,18 @@ public class AlertCalledController extends BaseController {
String
alertSourceCode
,
String
callTimeStart
,
String
callTimeEnd
){
/
/
Page<AlertCalled> pageBean;
//
IPage<AlertCalled> page;
/
*
Page<AlertCalled> pageBean;
IPage<AlertCalled> page;
QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
/*
page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
return ResponseHelper.buildResponse(page);
*/
setQueryWrapper
(
alertCalledQueryWrapper
,
alertCalled
,
sort
);
page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
return ResponseHelper.buildResponse(page);
setQueryWrapper(alertCalledQueryWrapper, alertCalled,sort);
*/
/*分页存在问题 修改分页参数 陈召 2021-09-22 开始*/
Page
<
AlertCalled
>
page
=
new
Page
<>();
if
(
StringUtils
.
isBlank
(
pageNum
)
||
StringUtils
.
isBlank
(
pageSize
))
{
page
=
new
Page
<>(
0
,
Long
.
MAX_VALUE
);
page
=
new
Page
<>();
page
.
setCurrent
(
0L
);
page
.
setSize
(
10L
);
}
else
{
page
.
setCurrent
(
(
Long
.
parseLong
(
pageNum
)
-
1
)
*
Long
.
parseLong
(
pageSize
));
page
.
setSize
(
Long
.
parseLong
(
pageSize
));
...
...
@@ -168,7 +170,7 @@ public class AlertCalledController extends BaseController {
/* bug2408 筛选参数解析异常 修改筛选条件方法 修改入参分离筛选条件
alertStatus 警情状态 alertTypeCode 报警类型code alertSourceCode 警情来源code
陈召 2021-08-21 开始*/
IPage
<
AlertCalled
>
alertCalledIPage
=
iAlertCalledService
.
queryForCalledList
(
page
,
alertStatus
,
alertTypeCode
,
alertSourceCode
,
callTimeStart
,
callTimeEnd
,
sort
);
IPage
<
AlertCalled
>
alertCalledIPage
=
iAlertCalledService
.
queryForCalledList
(
page
,
alertStatus
,
alertTypeCode
,
alertSourceCode
,
callTimeStart
,
callTimeEnd
,
sort
);
/* bug 2406 接警记录,列表缺少警情状态字段 by litw start*/
alertCalledIPage
.
getRecords
().
stream
().
forEach
(
e
->{
if
(
e
.
getAlertStatus
())
{
...
...
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