Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
389e6e31
Commit
389e6e31
authored
Dec 19, 2019
by
libin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'order_received_statistics' into dev
parents
8f95254c
0d61c47e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
ReceivedStatisticsEnum.java
...tform/order/contant/enumerate/ReceivedStatisticsEnum.java
+1
-0
OrderReceivedStatisticsVo.java
...xfc/platform/order/pojo/vo/OrderReceivedStatisticsVo.java
+1
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/ReceivedStatisticsEnum.java
View file @
389e6e31
...
@@ -108,6 +108,7 @@ public enum ReceivedStatisticsEnum {
...
@@ -108,6 +108,7 @@ public enum ReceivedStatisticsEnum {
.
weekOfYear
(
orderReceivedStatisticsBase
.
getWeekOfYear
())
.
weekOfYear
(
orderReceivedStatisticsBase
.
getWeekOfYear
())
.
year
(
orderReceivedStatisticsBase
.
getYear
())
.
year
(
orderReceivedStatisticsBase
.
getYear
())
.
orderNum
(
quantity
)
.
orderNum
(
quantity
)
.
dateStr
(
orderReceivedStatisticsBase
.
getDateStr
())
.
orderAmount
(
amount
)
.
orderAmount
(
amount
)
.
build
();
.
build
();
}
}
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/OrderReceivedStatisticsVo.java
View file @
389e6e31
...
@@ -23,6 +23,7 @@ public class OrderReceivedStatisticsVo {
...
@@ -23,6 +23,7 @@ public class OrderReceivedStatisticsVo {
private
String
year
;
private
String
year
;
@ApiModelProperty
(
"日期-->日统计方式"
)
@ApiModelProperty
(
"日期-->日统计方式"
)
private
Date
date
;
private
Date
date
;
private
String
dateStr
;
@ApiModelProperty
(
"第几周---->周统计方式"
)
@ApiModelProperty
(
"第几周---->周统计方式"
)
private
String
weekOfYear
;
private
String
weekOfYear
;
@ApiModelProperty
(
"月统计"
)
@ApiModelProperty
(
"月统计"
)
...
...
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