|
|
|
@ -128,8 +128,8 @@ public class DailyReportImp implements DailyReport {
|
|
|
|
|
kpi.put("kpi_percent", p.getBigDecimal("month_amount").divide(kpi_amount,4,BigDecimal.ROUND_HALF_DOWN).multiply(BigDecimal.valueOf(100)).toString().substring(0,5)+"%");
|
|
|
|
|
for(JSONObject clientAmount :clientsAmount ){
|
|
|
|
|
if(clientAmount.getString("bd_group").equals(kpi.getString("bd_group"))){
|
|
|
|
|
kpi.put("clients_month",clientAmount.getIntValue("clients_month"));
|
|
|
|
|
kpi.put("clients_yesterday",clientAmount.getIntValue("clients_yesterday"));
|
|
|
|
|
kpi.put("clients_month",clientAmount.getBigDecimal("clients_month"));
|
|
|
|
|
kpi.put("clients_yesterday",clientAmount.getBigDecimal("clients_yesterday"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
total_kpi_amount = total_kpi_amount.add(kpi_amount);
|
|
|
|
|