From 1a89114fb1ce35ef1484089ad9f567cd4ef7a441 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 10 May 2019 17:43:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E7=A7=9F=E7=8E=87=E8=B5=B0=E5=8A=BF?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/vo/WxBillAll.java | 18 ++++++++++++++++++ .../main/resources/mapper/WxBillAllMapper.xml | 1 + 2 files changed, 19 insertions(+) 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 d0974e874..8e71159a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -79,6 +79,24 @@ public class WxBillAll extends BaseEntity { private List billTypeList; + + @Transient + @SortColumn(column = "rentReceivePay") + private Integer rentReceivePay; + @Transient + @SortColumn(column = "propertyReceivePay") + private Integer propertyReceivePay; + @Transient + @SortColumn(column = "depositReceivePay") + private Integer depositReceivePay; + @Transient + @SortColumn(column = "otherReceivePay") + private Integer otherReceivePay; + @Transient + @SortColumn(column = "totalReceivePay") + private Integer totalReceivePay; + + @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") @Transient private Integer filterHasPay; diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 55276acb2..934291a69 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -496,6 +496,7 @@ select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, m.link_phone managerPhone,m.`link_person` manager,m.email, bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,ws.building,ws.floor, + round(bill.rentOwe/100,2) rentOwe, round(bill.propertyOwe/100,2) propertyOwe, round(bill.depositOwe/100,2) depositOwe,