|
|
|
@@ -2404,12 +2404,13 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
WxBillAll wxBillAll = new WxBillAll(); |
|
|
|
wxBillAll.setTenantId(tenantId); |
|
|
|
wxBillAll.setMonth(new SimpleDateFormat("yyyy-MM").format(startDate)); |
|
|
|
List<String> billTypeList = new ArrayList<>(); |
|
|
|
wxBillAll.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
|
List<Integer> billTypeList = new ArrayList<>(); |
|
|
|
billTypeList.add(EnumBillTypeStr.RENT.getCode()); |
|
|
|
wxBillAll.setBillTypeList(billTypeList); |
|
|
|
payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal owe = (BigDecimal) payinfo.get("owe"); |
|
|
|
BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); |
|
|
|
totalOwe = totalOwe.add(owe); |
|
|
|
datamap.put("rentOwe", owe); |
|
|
|
} else { |
|
|
|
@@ -2421,7 +2422,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
wxBillAll.setBillTypeList(billTypeList); |
|
|
|
payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal owe = (BigDecimal) payinfo.get("owe"); |
|
|
|
BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); |
|
|
|
totalOwe = totalOwe.add(owe); |
|
|
|
datamap.put("propertyOwe", owe); |
|
|
|
} else { |
|
|
|
@@ -2435,7 +2436,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
wxBillAll.setBillTypeList(billTypeList); |
|
|
|
payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal owe = (BigDecimal) payinfo.get("owe"); |
|
|
|
BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); |
|
|
|
totalOwe = totalOwe.add(owe); |
|
|
|
datamap.put("depositOwe", owe); |
|
|
|
} else { |
|
|
|
@@ -2447,9 +2448,10 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
billTypeList.add(EnumBillTypeStr.W.getCode()); |
|
|
|
billTypeList.add(EnumBillTypeStr.K.getCode()); |
|
|
|
billTypeList.add(EnumBillTypeStr.O.getCode()); |
|
|
|
wxBillAll.setBillTypeList(billTypeList); |
|
|
|
payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal owe = (BigDecimal) payinfo.get("owe"); |
|
|
|
BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); |
|
|
|
totalOwe = totalOwe.add(owe); |
|
|
|
datamap.put("otherOwe", owe); |
|
|
|
} else { |
|
|
|
|