|
@@ -60,15 +60,17 @@ public class KsNewPlanReportCtrl {
|
|
}
|
|
}
|
|
String startDate = requestBody.getString("startDate");
|
|
String startDate = requestBody.getString("startDate");
|
|
String endDate = requestBody.getString("endDate");
|
|
String endDate = requestBody.getString("endDate");
|
|
|
|
+ startDate=startDate+" 00:00:00";
|
|
|
|
+ endDate=endDate+" 59:59:59";
|
|
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.getKsNewPlanGroupByStatDate(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> 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> chartData = newMonitorService.getPlanMessageGroup(accountIds, startDate, endDate, "1");
|
|
- JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "1");*/
|
|
|
|
|
|
+ JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "1");
|
|
result.put("sumData", sumData);
|
|
result.put("sumData", sumData);
|
|
result.put("chartData", chartData);
|
|
result.put("chartData", chartData);
|
|
result.put("listData", listData);
|
|
result.put("listData", listData);
|
|
@@ -127,6 +129,8 @@ public class KsNewPlanReportCtrl {
|
|
}
|
|
}
|
|
String startDate = requestBody.getString("startDate");
|
|
String startDate = requestBody.getString("startDate");
|
|
String endDate = requestBody.getString("endDate");
|
|
String endDate = requestBody.getString("endDate");
|
|
|
|
+ startDate=startDate+" 00:00:00";
|
|
|
|
+ endDate=endDate+" 59:59:59";
|
|
String target = requestBody.getString("target");
|
|
String target = requestBody.getString("target");
|
|
String order = requestBody.getString("order");
|
|
String order = requestBody.getString("order");
|
|
List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");
|
|
List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");
|