Merge remote-tracking branch 'origin/develop'

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;
     }
 

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"