|
@@ -63,13 +63,13 @@ public class BytedanceNewPlanReportCtrl {
|
|
String target = requestBody.getString("target");
|
|
String target = requestBody.getString("target");
|
|
String order = requestBody.getString("order");
|
|
String order = requestBody.getString("order");
|
|
try {
|
|
try {
|
|
- JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
|
|
|
|
|
|
+ /* JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
|
|
List<JSONObject> chartData = newPlanReportService.getBytedanceNewPlanGroupByStatDate(accountIds, startDate, endDate);
|
|
List<JSONObject> chartData = newPlanReportService.getBytedanceNewPlanGroupByStatDate(accountIds, startDate, endDate);
|
|
List<JSONObject> listData = newPlanReportService.getBytedanceNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
|
|
List<JSONObject> listData = newPlanReportService.getBytedanceNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
|
|
-
|
|
|
|
- /* JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "0");
|
|
|
|
|
|
+*/
|
|
|
|
+ JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "0");
|
|
List<JSONObject> chartData = newMonitorService.getPlanMessageGroup(accountIds, startDate, endDate, "0");
|
|
List<JSONObject> chartData = newMonitorService.getPlanMessageGroup(accountIds, startDate, endDate, "0");
|
|
- List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "0");*/
|
|
|
|
|
|
+ List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "0");
|
|
result.put("sumData", sumData);
|
|
result.put("sumData", sumData);
|
|
result.put("chartData", chartData);
|
|
result.put("chartData", chartData);
|
|
result.put("listData", listData);
|
|
result.put("listData", listData);
|