From f648748583b908b530290075417e63c06eb80a17 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 20 Apr 2018 16:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/CourseFacade.java | 11 ++++++++--- .../lyms/platform/operate/web/worker/CourseCountWorker.java | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 74e6dfb..43bed77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -436,7 +436,7 @@ public class CourseFacade { query.setPublishTimeStart(DateUtil.parseYMD(startTime)); if (dates.length == 2) { endTime = dates[1]; - query.setPublishTimeStart(DateUtil.parseYMDHMS(endTime + " 23:59:59")); + query.setPublishTimeEnd(DateUtil.parseYMDHMS(endTime + " 23:59:59")); } } @@ -529,10 +529,15 @@ public class CourseFacade { tableItem.put("courseTypeName", "合计"); tableItem.put("courseName",courseModelList.size()); tableItem.put("orders", orderAll); - tableItem.put("ordersRate", sendAll == 0 ? "0" : df.format((double) orderAll / sendAll * 100) + "%"); + tableItem.put("ordersRate", sendAll == 0 ? "0.00" : df.format((double) orderAll / sendAll * 100) + "%"); tableItem.put("signs",signsAll); - tableItem.put("signsRate",orderAll == 0 ? "0" : df.format((double) signsAll / orderAll * 100) + "%"); + tableItem.put("signsRate",orderAll == 0 ? "0.00" : df.format((double) signsAll / orderAll * 100) + "%"); tableData.add(tableItem); + + chartData.put("titles",titles); + chartData.put("sends",sends); + chartData.put("orders",orders); + chartData.put("signs",signs); } resultData.put("totalData",totalData); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java index 9d39f0b..c8e8462 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java @@ -91,9 +91,9 @@ public class CourseCountWorker implements Callable { topmap.put("sends",String.valueOf(courseSends)); topmap.put("orders",String.valueOf(courseOrders)); - topmap.put("ordersRate",String.valueOf(courseSends == 0 ? "0" : df.format((double) courseOrders / courseSends * 100)) + "%"); + topmap.put("ordersRate",String.valueOf(courseSends == 0 ? "0.00" : df.format((double) courseOrders / courseSends * 100)) + "%"); topmap.put("signs",String.valueOf(courseSigns)); - topmap.put("signsRate", String.valueOf(courseOrders == 0 ? "0" : df.format((double) courseSigns / courseOrders * 100)) + "%"); + topmap.put("signsRate", String.valueOf(courseOrders == 0 ? "0.00" : df.format((double) courseSigns / courseOrders * 100)) + "%"); data.add(topmap); } -- 1.8.3.1