|
|
|
@@ -2294,6 +2294,12 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
return new ResultData(datamap); |
|
|
|
} |
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
|
double a = 0.0; |
|
|
|
System.out.println(a==0.0); |
|
|
|
System.out.println(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 费用收缴数据 |
|
|
|
* @param tenantId |
|
|
|
@@ -2305,12 +2311,12 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
startDate = DateUtils.getFirstDayForCurrMonth(startDate); |
|
|
|
Date endDate = DateUtils.getLastDayForMonth(startDate); |
|
|
|
|
|
|
|
//租金收缴率 |
|
|
|
//租金收缴率 ysje 应收金额 ssje 实收金额 zjsjl收缴率 |
|
|
|
Map<String, Object> params = new HashMap<>(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
params.put("startdate", DateUtils.date2String(startDate,"yyyy-MM-dd") + " 00:00:00"); |
|
|
|
params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); |
|
|
|
Map<String, Object> payinfo = wxBillRentMapper.queryPayInfo(params); |
|
|
|
Map<String, Object> payinfo = wxBillRentMapper.queryPayInfoTotal(params); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); |
|
|
|
BigDecimal pay = (BigDecimal) payinfo.get("pay"); |
|
|
|
@@ -2332,7 +2338,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
} |
|
|
|
|
|
|
|
//物业费收缴率 |
|
|
|
payinfo = wxBillPropertyMapper.queryPayInfo(params); |
|
|
|
payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); |
|
|
|
BigDecimal pay = (BigDecimal) payinfo.get("pay"); |
|
|
|
@@ -2354,7 +2360,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
} |
|
|
|
|
|
|
|
//押金收缴率 |
|
|
|
payinfo = wxBillDepositMapper.queryPayInfoAll(params); |
|
|
|
payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); |
|
|
|
BigDecimal pay = (BigDecimal) payinfo.get("pay"); |
|
|
|
@@ -2376,7 +2382,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
} |
|
|
|
|
|
|
|
//其他费用收缴率 |
|
|
|
payinfo = wxBillOtherMapper.queryPayInfo(params); |
|
|
|
payinfo = wxBillOtherMapper.queryPayInfoTotal(params); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); |
|
|
|
BigDecimal pay = (BigDecimal) payinfo.get("pay"); |
|
|
|
|