Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
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
base_platform_enterprise
gic-platform-enterprise
Commits
fc8f19c3
Commit
fc8f19c3
authored
Apr 20, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
通知详情修改
parent
82e493ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
IndexModuleController.java
.../gic/enterprise/web/controller/IndexModuleController.java
+3
-3
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java
View file @
fc8f19c3
...
...
@@ -59,11 +59,11 @@ public class IndexModuleController {
try
{
ServiceResponse
<
Page
<
UserMessageDTO
>>
response
=
this
.
pushMessageApiService
.
pageUserMessage
(
userId
,
search
,
status
,
StringUtils
.
isBlank
(
startTime
)
?
null
:
sdf
.
parse
(
startTime
+
" 00:00:00"
),
StringUtils
.
isBlank
(
endTime
)
?
null
:
sdf
.
parse
(
endTime
+
" 23:59:59"
),
pushClassifyId
,
pageQO
.
getCurrentPage
(),
pageQO
.
getPageSize
());
ServiceResponse
<
Integer
>
unReadResponse
=
this
.
pushMessageApiService
.
totalUserMessage
(
userId
,
search
,
1
,
StringUtils
.
isBlank
(
startTime
)
?
null
:
sdf
.
parse
(
startTime
+
" 00:00:00"
),
StringUtils
.
isBlank
(
endTime
)
?
null
:
sdf
.
parse
(
endTime
+
" 23:59:59"
),
pushClassifyId
);
//
ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(userId, search, 1, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
//
StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId);
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
result
.
put
(
"page"
,
response
.
getResult
());
result
.
put
(
"unReadCount"
,
unReadResponse
.
getResult
());
//
result.put("unReadCount", unReadResponse.getResult());
return
RestResponse
.
success
(
result
);
}
catch
(
ParseException
e
)
{
log
.
warn
(
"异常"
,
e
);
...
...
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