|
@@ -761,6 +761,7 @@ public class SupplyChainController extends BaseController {
|
|
|
private TableDataInfo indexOrderRankBytedance(Integer dateType, String orderStartDate, String orderEndDate) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (dateType == 0) {
|
|
|
+ Integer hour = DateUtils.getNowHour(); // 当前小时
|
|
|
Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate);
|
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
|
Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日时间
|
|
@@ -768,6 +769,8 @@ public class SupplyChainController extends BaseController {
|
|
|
requestMap.put("nowEndHourTemp", nowStartHourTemp);
|
|
|
requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
|
requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
|
|
|
+ requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
|
|
|
+ requestMap.put("hour", hour);
|
|
|
startPage();
|
|
|
List<JSONObject> orderRankRatioList = supplyChainService.getOrderRankRatioListBytedance(requestMap);
|
|
|
return getDataTable(orderRankRatioList);
|
|
@@ -859,6 +862,7 @@ public class SupplyChainController extends BaseController {
|
|
|
}
|
|
|
requestMap.put("promoterIds", promoterIds);
|
|
|
}
|
|
|
+ Integer hour = DateUtils.getNowHour(); // 当前小时
|
|
|
Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate); // 当天开始时间戳
|
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
|
Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日开始时间戳
|
|
@@ -866,6 +870,8 @@ public class SupplyChainController extends BaseController {
|
|
|
requestMap.put("nowEndHourTemp", nowStartHourTemp);
|
|
|
requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
|
requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
|
|
|
+ requestMap.put("yesterdayEndHourTemp", yesterdayStartHourTemp);
|
|
|
+ requestMap.put("hour", hour);
|
|
|
startPage();
|
|
|
List<JSONObject> promoterRankRatioList = supplyChainService.getPromoterRankRatioListBytedance(requestMap);
|
|
|
return getDataTable(promoterRankRatioList);
|