Commit 1e8476bb by songyinghui

feature: 自定义时间

parent 9dab2b03
......@@ -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);
}
......
......@@ -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)) {
......
......@@ -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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment