Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
1e8476bb
Commit
1e8476bb
authored
Jan 02, 2024
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature: 自定义时间
parent
9dab2b03
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
2 deletions
+35
-2
MaterialDataStaticsController.java
...web/controller/content/MaterialDataStaticsController.java
+1
-1
MaterialDataAdaptor.java
...e/web/controller/content/adaptor/MaterialDataAdaptor.java
+8
-1
MaterialStatisticsBaseQO.java
...e/web/qo/content/statistics/MaterialStatisticsBaseQO.java
+26
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java
View file @
1e8476bb
...
...
@@ -154,7 +154,7 @@ public class MaterialDataStaticsController {
storeIds
.
add
(
materialStatisticsBaseQO
.
getStoreId
());
}
MaterialDataOverviewVO
materialDataOverviewVO
=
materialDataAdaptor
.
queryMaterialDataOverview
(
materialStatisticsBaseQO
.
getEnterpriseId
(),
storeIds
,
materialStatisticsBaseQO
.
getFixedDateDiff
());
materialDataAdaptor
.
queryMaterialDataOverview
(
materialStatisticsBaseQO
,
materialStatisticsBaseQO
.
getEnterpriseId
(),
storeIds
,
materialStatisticsBaseQO
.
getFixedDateDiff
());
return
RestResponse
.
successResult
(
materialDataOverviewVO
);
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java
View file @
1e8476bb
...
...
@@ -140,11 +140,13 @@ public class MaterialDataAdaptor {
* @param fixedDateDiff
* @return
*/
public
MaterialDataOverviewVO
queryMaterialDataOverview
(
String
enterpriseId
,
List
<
String
>
storeIds
,
Integer
fixedDateDiff
)
{
public
MaterialDataOverviewVO
queryMaterialDataOverview
(
MaterialAnalyzeDataQO
dataQO
,
String
enterpriseId
,
List
<
String
>
storeIds
,
Integer
fixedDateDiff
)
{
Map
<
String
,
Object
>
inlineParams
=
new
HashMap
<>();
inlineParams
.
put
(
"enterpriseId"
,
enterpriseId
);
inlineParams
.
put
(
"fixedDateDiff"
,
fixedDateDiff
);
inlineParams
.
put
(
"startDate"
,
dataQO
.
getStartDate
());
inlineParams
.
put
(
"endDate"
,
dataQO
.
getEndDate
());
if
(
CollectionUtil
.
isNotEmpty
(
storeIds
))
{
inlineParams
.
put
(
"storeId"
,
StringUtils
.
join
(
storeIds
,
","
));
}
...
...
@@ -175,6 +177,9 @@ public class MaterialDataAdaptor {
inlineParams
.
put
(
"pageSize"
,
pageSize
);
inlineParams
.
put
(
"enterpriseId"
,
enterpriseId
);
inlineParams
.
put
(
"fixedDateDiff"
,
fixedDateDiff
);
inlineParams
.
put
(
"startDate"
,
dataQO
.
getStartDate
());
inlineParams
.
put
(
"endDate"
,
dataQO
.
getEndDate
());
int
orderByFields
=
DataApiUtils
.
getOrderByFields
(
orderByField
,
"enterpriseId"
,
dataQO
.
getFieldsOrder
());
inlineParams
.
put
(
"orderByFields"
,
orderByFields
);
inlineParams
.
put
(
"orderByType"
,
DataApiUtils
.
getOrderByType
(
order
));
...
...
@@ -207,6 +212,8 @@ public class MaterialDataAdaptor {
inlineParams
.
put
(
"pageSize"
,
pageSize
);
inlineParams
.
put
(
"enterpriseId"
,
enterpriseId
);
inlineParams
.
put
(
"fixedDateDiff"
,
fixedDateDiff
);
inlineParams
.
put
(
"startDate"
,
dataQO
.
getStartDate
());
inlineParams
.
put
(
"endDate"
,
dataQO
.
getEndDate
());
inlineParams
.
put
(
"orderByFields"
,
DataApiUtils
.
getOrderByFields
(
orderByField
,
"enterpriseId"
,
dataQO
.
getFieldsOrder
()));
inlineParams
.
put
(
"orderByType"
,
DataApiUtils
.
getOrderByType
(
order
));
if
(
CollectionUtil
.
isNotEmpty
(
storeIds
))
{
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialStatisticsBaseQO.java
View file @
1e8476bb
...
...
@@ -32,6 +32,16 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
*/
private
String
storeId
;
/**
* 开始时间
*/
private
String
startDate
;
/**
* 结束时间
*/
private
String
endDate
;
public
String
getEnterpriseId
()
{
return
enterpriseId
;
...
...
@@ -56,4 +66,20 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
public
void
setStoreId
(
String
storeId
)
{
this
.
storeId
=
storeId
;
}
public
String
getStartDate
()
{
return
startDate
;
}
public
void
setStartDate
(
String
startDate
)
{
this
.
startDate
=
startDate
;
}
public
String
getEndDate
()
{
return
endDate
;
}
public
void
setEndDate
(
String
endDate
)
{
this
.
endDate
=
endDate
;
}
}
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