Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
39f6986d
Commit
39f6986d
authored
May 06, 2021
by
jiawei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://111.203.232.171:8888/lee/chnmuseum-party
parents
e3853537
345862d4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
TBoardStatisticController.java
...useum/party/web/controller/TBoardStatisticController.java
+12
-7
No files found.
src/main/java/cn/chnmuseum/party/web/controller/TBoardStatisticController.java
View file @
39f6986d
...
@@ -56,6 +56,10 @@ public class TBoardStatisticController extends BaseController {
...
@@ -56,6 +56,10 @@ public class TBoardStatisticController extends BaseController {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
survey
.
setOrganCode
(
null
);
survey
.
setOrganCode
(
null
);
}
}
// 默认当月
if
(
StringUtils
.
isEmpty
(
survey
.
getStatisticDate
()))
{
survey
.
setStatisticDate
(
DateUtil
.
getCurrentDate
(
"yyyyMM"
));
}
TBoardSurvey
result
=
this
.
tBoardStatisticService
.
getBoardSurvey
(
survey
);
TBoardSurvey
result
=
this
.
tBoardStatisticService
.
getBoardSurvey
(
survey
);
return
getResult
(
result
);
return
getResult
(
result
);
...
@@ -78,10 +82,11 @@ public class TBoardStatisticController extends BaseController {
...
@@ -78,10 +82,11 @@ public class TBoardStatisticController extends BaseController {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
rank
.
setOrganCode
(
null
);
rank
.
setOrganCode
(
null
);
}
}
Page
<
TBoardPlayRank
>
page
=
this
.
tBoardStatisticService
.
getBoardRankPageList
(
getPage
(),
rank
);
// 默认当月
for
(
TBoardPlayRank
tBoardStatistic
:
page
.
getRecords
(
))
{
if
(
StringUtils
.
isEmpty
(
rank
.
getPlayDate
()
))
{
rank
.
setPlayDate
(
DateUtil
.
getCurrentDate
(
"yyyyMM"
));
}
}
Page
<
TBoardPlayRank
>
page
=
this
.
tBoardStatisticService
.
getBoardRankPageList
(
getPage
(),
rank
);
return
getResult
(
page
);
return
getResult
(
page
);
}
}
...
@@ -189,11 +194,11 @@ public class TBoardStatisticController extends BaseController {
...
@@ -189,11 +194,11 @@ public class TBoardStatisticController extends BaseController {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
district
.
setOrganCode
(
null
);
district
.
setOrganCode
(
null
);
}
}
// 默认当月
Page
<
TDistrictBoardStatistic
>
page
=
this
.
tBoardStatisticService
.
getBoardDistrictPageList
(
getPage
(),
district
);
if
(
StringUtils
.
isEmpty
(
district
.
getPlayDate
()))
{
for
(
TDistrictBoardStatistic
tBoardStatistic
:
page
.
getRecords
())
{
district
.
setPlayDate
(
DateUtil
.
getCurrentDate
(
"yyyyMM"
));
}
}
Page
<
TDistrictBoardStatistic
>
page
=
this
.
tBoardStatisticService
.
getBoardDistrictPageList
(
getPage
(),
district
);
return
getResult
(
page
);
return
getResult
(
page
);
}
}
...
...
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