|
@@ -68,12 +68,12 @@ public class KsNewGroupReportCtrl {
|
|
String target = requestBody.getString("target");
|
|
String target = requestBody.getString("target");
|
|
String order = requestBody.getString("order");
|
|
String order = requestBody.getString("order");
|
|
try {
|
|
try {
|
|
- //JSONObject sumData = newGroupReportService.getSumNewGroupBy(accountIds, startDate, endDate);
|
|
|
|
|
|
+ JSONObject sumData = newGroupReportService.getSumNewGroupBy(accountIds, startDate, endDate);
|
|
|
|
+ List<JSONObject> chartData = newGroupReportService.getKsNewGroupGroupByStatDate(accountIds, startDate, endDate);
|
|
|
|
+ List<JSONObject> listData = newGroupReportService.getKsNewGroupGroupByAccount(accountIds, startDate, endDate, target, order);
|
|
|
|
+ /* List<JSONObject> chartData = newMonitorService.getKuaiShouGroupMessageGroup(accountIds, startDate, endDate);
|
|
JSONObject sumData = newMonitorService.getKuaiShouGroupSum(accountIds, startDate, endDate);
|
|
JSONObject sumData = newMonitorService.getKuaiShouGroupSum(accountIds, startDate, endDate);
|
|
- //List<JSONObject> chartData = newGroupReportService.getKsNewGroupGroupByStatDate(accountIds, startDate, endDate);
|
|
|
|
- List<JSONObject> chartData = newMonitorService.getKuaiShouGroupMessageGroup(accountIds, startDate, endDate);
|
|
|
|
- //List<JSONObject> listData = newGroupReportService.getKsNewGroupGroupByAccount(accountIds, startDate, endDate, target, order);
|
|
|
|
- List<JSONObject> listData = newMonitorService.getKuaiShouGroupMessage(accountIds, startDate, endDate, target);
|
|
|
|
|
|
+ List<JSONObject> listData = newMonitorService.getKuaiShouGroupMessage(accountIds, startDate, endDate, target);*/
|
|
result.put("sumData", sumData);
|
|
result.put("sumData", sumData);
|
|
result.put("chartData", chartData);
|
|
result.put("chartData", chartData);
|
|
result.put("listData", listData);
|
|
result.put("listData", listData);
|
|
@@ -108,6 +108,7 @@ public class KsNewGroupReportCtrl {
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
+
|
|
@PostMapping("/report/excel")
|
|
@PostMapping("/report/excel")
|
|
public void getExcelReport(@RequestBody JSONObject requestBody,
|
|
public void getExcelReport(@RequestBody JSONObject requestBody,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
@@ -144,7 +145,7 @@ public class KsNewGroupReportCtrl {
|
|
excelList.add(temp);
|
|
excelList.add(temp);
|
|
});
|
|
});
|
|
try {
|
|
try {
|
|
- String[] headers = {"账户名称","账户ID","账户所属人","新上推广组","有效推广组","最近上新时间"};
|
|
|
|
|
|
+ String[] headers = {"账户名称", "账户ID", "账户所属人", "新上推广组", "有效推广组", "最近上新时间"};
|
|
OutputStream os = response.getOutputStream();
|
|
OutputStream os = response.getOutputStream();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -157,6 +158,7 @@ public class KsNewGroupReportCtrl {
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询所有的快手运营
|
|
* 查询所有的快手运营
|
|
*/
|
|
*/
|