From 8b31fc4a854f4f0bf9b509ae083de7f2c29fa19a Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 16:27:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxBillAll.java | 9 ++++ .../com/iformall/enums/EnumBillTypeStr.java | 43 +++++++++++++++++++ .../service/impl/WxChartServiceImpl.java | 41 +++++++++++++----- .../resources/mapper/WxBillDepositMapper.xml | 8 ++-- .../resources/mapper/WxBillOtherMapper.xml | 10 ++++- .../resources/mapper/WxBillPropertyMapper.xml | 2 +- .../resources/mapper/WxBillRentMapper.xml | 2 +- 7 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index e0d57bc93..fde116d79 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -65,6 +65,15 @@ public class WxBillAll { @io.swagger.annotations.ApiModelProperty(value = "欠缴总额", name = "totalOwe") private Integer totalOwe; + private List billTypeList; + + public List getBillTypeList() { + return billTypeList; + } + + public void setBillTypeList(List billTypeList) { + this.billTypeList = billTypeList; + } public Integer getRentOwe() { return rentOwe; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java new file mode 100644 index 000000000..9ab2c0a78 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java @@ -0,0 +1,43 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumBillTypeStr { + + RENT("租金", "租金"), + RENT_D("租赁押金", "租赁押金"), + PROPERTY("物业费","物业费"), + PROPERTY_D("物业押金", "物业押金"), + W("水费", "水费"), + D("电费", "电费"), + K("空调费", "空调费"), + O("其他", "其他"), + O_D("其他押金", "其他押金"), + ; + + public static EnumBillTypeStr getEnum(String code) { + for (EnumBillTypeStr value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private String code; + private String message; + + EnumBillTypeStr(String String, String message) { + this.code = code; + this.message = message; + } + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 22d31b5c8..c470a1f46 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -71,6 +71,8 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired WxBillOtherMapper wxBillOtherMapper; @Autowired + WxBillAllMapper wxBillAllMapper; + @Autowired MarkingDataReportService markingDataReportService; @Override @@ -2397,9 +2399,15 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("otherzjsjl", 0); } - //欠缴数据 + //==========欠缴数据========= BigDecimal totalOwe = new BigDecimal(0); - payinfo = wxBillRentMapper.queryOweInfo(params); + WxBillAll wxBillAll = new WxBillAll(); + wxBillAll.setTenantId(tenantId); + wxBillAll.setMonth(new SimpleDateFormat("yyyy-MM").format(startDate)); + List billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.RENT.getCode()); + wxBillAll.setBillTypeList(billTypeList); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); @@ -2408,7 +2416,10 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("rentOwe", 0); } - payinfo = wxBillPropertyMapper.queryOweInfo(params); + billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.PROPERTY.getCode()); + wxBillAll.setBillTypeList(billTypeList); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); @@ -2417,25 +2428,35 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("propertyOwe", 0); } - payinfo = wxBillOtherMapper.queryOweInfo(params); + billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.O_D.getCode()); + billTypeList.add(EnumBillTypeStr.PROPERTY_D.getCode()); + billTypeList.add(EnumBillTypeStr.RENT_D.getCode()); + wxBillAll.setBillTypeList(billTypeList); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); - datamap.put("otherOwe", owe); + datamap.put("depositOwe", owe); } else { - datamap.put("otherOwe", 0); + datamap.put("depositOwe", 0); } - payinfo = wxBillDepositMapper.queryOweInfoAll(params); + billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.D.getCode()); + billTypeList.add(EnumBillTypeStr.W.getCode()); + billTypeList.add(EnumBillTypeStr.K.getCode()); + billTypeList.add(EnumBillTypeStr.O.getCode()); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); - datamap.put("totalOwe", owe); + datamap.put("otherOwe", owe); } else { - datamap.put("totalOwe", 0); + datamap.put("otherOwe", 0); } - datamap.put("totalOwe", totalOwe); + datamap.put("totalOwe", totalOwe); return new ResultData(datamap); } diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 74e79294e..25cc0a36b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -98,7 +98,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 10acfc640..53468e9cb 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -111,8 +111,14 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index ea8656d46..9b054e522 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -122,7 +122,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 97cc826bb..59a530d18 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -125,7 +125,7 @@