From ae9346e6706a6c842f006dc13c47a8e0a18c1eab Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Wed, 22 May 2019 14:01:12 +0800
Subject: [PATCH] =?UTF-8?q?kpi=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/analysis/core/impls/DailyReportImp.java   | 3 +++
 src/main/resources/templates/reports/daily_report.html       | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java
index f68e87375..cd462889d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java
@@ -139,6 +139,9 @@ public class DailyReportImp implements DailyReport {
         report.put("kpiList",kpiList);
         report.put("kpi_percent_total",total_month_amount.divide(total_kpi_amount,4,BigDecimal.ROUND_HALF_DOWN).multiply(BigDecimal.valueOf(100)).toString().substring(0,5)+"%");
         report.put("total_month_amount",total_month_amount);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(dt);
+        report.put("time_percent",BigDecimal.valueOf(calendar.get(Calendar.DAY_OF_MONTH)).divide(BigDecimal.valueOf(calendar.getActualMaximum(Calendar.DAY_OF_MONTH)),4,BigDecimal.ROUND_HALF_DOWN).multiply(BigDecimal.valueOf(100)).toString().substring(0,5)+"%");
         return report;
     }
 
diff --git a/src/main/resources/templates/reports/daily_report.html b/src/main/resources/templates/reports/daily_report.html
index 8130f4909..31d58f921 100644
--- a/src/main/resources/templates/reports/daily_report.html
+++ b/src/main/resources/templates/reports/daily_report.html
@@ -145,6 +145,11 @@
                                 <div class="weui-cell__ft weui-flex__item"
                                      th:text="${report.kpi.kpi_percent_total}"></div>
                             </div>
+                            <div class="weui-cell weui-flex">
+                                <div class="weui-cell__hd weui-flex__item">时间进度</div>
+                                <div class="weui-cell__ft weui-flex__item"
+                                     th:text="${report.kpi.time_percent}"></div>
+                            </div>
                             <div class="weui-cell weui-flex"
                                  th:each=" kpi : ${report.kpi.kpiList}">
                                 <div class="weui-cell__hd weui-flex__item"