| @@ -2298,9 +2298,9 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| double totalRentRate = new Double(rentTotal)/new Double(total)*100; | double totalRentRate = new Double(rentTotal)/new Double(total)*100; | ||||
| datamap.put("notRentTotal",formatDouble(totalRentRate)); | datamap.put("notRentTotal",formatDouble(totalRentRate)); | ||||
| double rentTotalShopRate = rentTotalShop/totalShop*100; | |||||
| double rentTotalShopRate = new Double(rentTotalShop)/ new Double(totalShop)*100; | |||||
| datamap.put("rentTotalShopRate",formatDouble(rentTotalShopRate)); | datamap.put("rentTotalShopRate",formatDouble(rentTotalShopRate)); | ||||
| double rentTotalPointRate = rentTotalPoint/totalPoint*100; | |||||
| double rentTotalPointRate = new Double(rentTotalPoint)/ new Double(totalPoint)*100; | |||||
| datamap.put("rentTotalPointRate",formatDouble(rentTotalPointRate)); | datamap.put("rentTotalPointRate",formatDouble(rentTotalPointRate)); | ||||
| return new ResultData(datamap); | return new ResultData(datamap); | ||||
| @@ -2324,8 +2324,8 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); | params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); | ||||
| Map<String, Object> payinfo = wxBillRentMapper.queryPayInfoTotal(params); | Map<String, Object> payinfo = wxBillRentMapper.queryPayInfoTotal(params); | ||||
| if (payinfo != null) { | if (payinfo != null) { | ||||
| Double receivepay = (Double) payinfo.get("receivepay"); | |||||
| Double pay = (Double) payinfo.get("pay"); | |||||
| Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); | |||||
| Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); | |||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| Double divide = pay/receivepay*100; | Double divide = pay/receivepay*100; | ||||
| datamap.put("rentysje", receivepay); | datamap.put("rentysje", receivepay); | ||||
| @@ -2345,8 +2345,8 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| //物业费收缴率 | //物业费收缴率 | ||||
| payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); | payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); | ||||
| if (payinfo != null) { | if (payinfo != null) { | ||||
| Double receivepay = (Double) payinfo.get("receivepay"); | |||||
| Double pay = (Double) payinfo.get("pay"); | |||||
| Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); | |||||
| Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); | |||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| Double divide = pay/receivepay*100; | Double divide = pay/receivepay*100; | ||||
| datamap.put("propertyysje", receivepay); | datamap.put("propertyysje", receivepay); | ||||
| @@ -2366,8 +2366,8 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| //押金收缴率 | //押金收缴率 | ||||
| payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); | payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); | ||||
| if (payinfo != null) { | if (payinfo != null) { | ||||
| Double receivepay = (Double) payinfo.get("receivepay"); | |||||
| Double pay = (Double) payinfo.get("pay"); | |||||
| Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); | |||||
| Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); | |||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| Double divide = pay/receivepay* 100; | Double divide = pay/receivepay* 100; | ||||
| datamap.put("depositysje", receivepay); | datamap.put("depositysje", receivepay); | ||||
| @@ -2387,8 +2387,8 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| //其他费用收缴率 | //其他费用收缴率 | ||||
| payinfo = wxBillOtherMapper.queryPayInfoTotal(params); | payinfo = wxBillOtherMapper.queryPayInfoTotal(params); | ||||
| if (payinfo != null) { | if (payinfo != null) { | ||||
| Double receivepay = (Double) payinfo.get("receivepay"); | |||||
| Double pay = (Double) payinfo.get("pay"); | |||||
| Double receivepay = ((BigDecimal) payinfo.get("receivepay")).doubleValue(); | |||||
| Double pay = ((BigDecimal) payinfo.get("pay")).doubleValue(); | |||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| Double divide = pay/receivepay*100; | Double divide = pay/receivepay*100; | ||||
| datamap.put("otherysje", receivepay); | datamap.put("otherysje", receivepay); | ||||