|
@@ -63,12 +63,12 @@ public class KsNewPlanReportCtrl {
|
|
|
String target = requestBody.getString("target");
|
|
|
String order = requestBody.getString("order");
|
|
|
try {
|
|
|
- //JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
|
|
|
- JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "1");
|
|
|
- //List<JSONObject> chartData = newPlanReportService.getKsNewPlanGroupByStatDate(accountIds, startDate, endDate);
|
|
|
+ JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
|
|
|
+ List<JSONObject> chartData = newPlanReportService.getKsNewPlanGroupByStatDate(accountIds, startDate, endDate);
|
|
|
+ List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
|
|
|
+ /* List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");
|
|
|
List<JSONObject> chartData = newMonitorService.getPlanMessageGroup(accountIds, startDate, endDate, "1");
|
|
|
- //List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
|
|
|
- List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");
|
|
|
+ JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "1");*/
|
|
|
result.put("sumData", sumData);
|
|
|
result.put("chartData", chartData);
|
|
|
result.put("listData", listData);
|
|
@@ -143,7 +143,7 @@ public class KsNewPlanReportCtrl {
|
|
|
excelList.add(temp);
|
|
|
});
|
|
|
try {
|
|
|
- String[] headers = {"账户名称","账户ID","账户所属人","新上计划数","有效计划数","最近上新时间"};
|
|
|
+ String[] headers = {"账户名称", "账户ID", "账户所属人", "新上计划数", "有效计划数", "最近上新时间"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -156,6 +156,7 @@ public class KsNewPlanReportCtrl {
|
|
|
log.error(e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 查询所有的快手运营
|
|
|
*/
|