jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f648748583b908b530290075417e63c06eb80a17

Authored by liquanyu
1 parent 4e0a4a2af9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕妇学校

Showing 2 changed files with 10 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ f648748
... ... @@ -436,7 +436,7 @@
436 436 query.setPublishTimeStart(DateUtil.parseYMD(startTime));
437 437 if (dates.length == 2) {
438 438 endTime = dates[1];
439   - query.setPublishTimeStart(DateUtil.parseYMDHMS(endTime + " 23:59:59"));
  439 + query.setPublishTimeEnd(DateUtil.parseYMDHMS(endTime + " 23:59:59"));
440 440 }
441 441  
442 442 }
443 443  
444 444  
... ... @@ -529,10 +529,15 @@
529 529 tableItem.put("courseTypeName", "合计");
530 530 tableItem.put("courseName",courseModelList.size());
531 531 tableItem.put("orders", orderAll);
532   - tableItem.put("ordersRate", sendAll == 0 ? "0" : df.format((double) orderAll / sendAll * 100) + "%");
  532 + tableItem.put("ordersRate", sendAll == 0 ? "0.00" : df.format((double) orderAll / sendAll * 100) + "%");
533 533 tableItem.put("signs",signsAll);
534   - tableItem.put("signsRate",orderAll == 0 ? "0" : df.format((double) signsAll / orderAll * 100) + "%");
  534 + tableItem.put("signsRate",orderAll == 0 ? "0.00" : df.format((double) signsAll / orderAll * 100) + "%");
535 535 tableData.add(tableItem);
  536 +
  537 + chartData.put("titles",titles);
  538 + chartData.put("sends",sends);
  539 + chartData.put("orders",orders);
  540 + chartData.put("signs",signs);
536 541 }
537 542  
538 543 resultData.put("totalData",totalData);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java View file @ f648748
... ... @@ -91,9 +91,9 @@
91 91  
92 92 topmap.put("sends",String.valueOf(courseSends));
93 93 topmap.put("orders",String.valueOf(courseOrders));
94   - topmap.put("ordersRate",String.valueOf(courseSends == 0 ? "0" : df.format((double) courseOrders / courseSends * 100)) + "%");
  94 + topmap.put("ordersRate",String.valueOf(courseSends == 0 ? "0.00" : df.format((double) courseOrders / courseSends * 100)) + "%");
95 95 topmap.put("signs",String.valueOf(courseSigns));
96   - topmap.put("signsRate", String.valueOf(courseOrders == 0 ? "0" : df.format((double) courseSigns / courseOrders * 100)) + "%");
  96 + topmap.put("signsRate", String.valueOf(courseOrders == 0 ? "0.00" : df.format((double) courseSigns / courseOrders * 100)) + "%");
97 97  
98 98 data.add(topmap);
99 99 }