From 4d04a1ee016e382592e153b37f40fc6b887385b4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 17 May 2019 15:47:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=BC=80=E5=8F=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=90=88=E5=90=8C=E9=9C=80=E6=B1=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxBillDaily.java | 12 +++++++++++ .../iformall/domain/po/WxBillProperty.java | 21 +++++++++++++++++++ .../com/iformall/domain/po/WxBillRent.java | 8 +++++++ .../resources/mapper/WxBillPropertyMapper.xml | 3 ++- 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 8b6c2236c..a4731dd64 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -141,6 +141,18 @@ public class WxBillDaily extends BaseEntity{ @SortColumn(column = "period") private Integer period; + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; + + public String getShopNumber() { + return shopNumber; + } + + public void setShopNumber(String shopNumber) { + this.shopNumber = shopNumber; + } + public Integer getAllPeriod() { return allPeriod; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index f3e972edc..ae4331f6f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -140,6 +140,27 @@ public class WxBillProperty extends BaseEntity { @Transient @SortColumn(column = "allPeriod") private Integer allPeriod; + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; + @Transient + private Integer depositStatus; + + public String getShopNumber() { + return shopNumber; + } + + public void setShopNumber(String shopNumber) { + this.shopNumber = shopNumber; + } + + public Integer getDepositStatus() { + return depositStatus; + } + + public void setDepositStatus(Integer depositStatus) { + this.depositStatus = depositStatus; + } public Integer getAllPeriod() { return allPeriod; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index bee4fce00..e0bfe358a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -151,6 +151,14 @@ public class WxBillRent extends BaseEntity { @Transient private Integer depositStatus; + public String getShopNumber() { + return shopNumber; + } + + public void setShopNumber(String shopNumber) { + this.shopNumber = shopNumber; + } + public Integer getDepositStatus() { return depositStatus; } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 59318dc5c..0ba61b9da 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -107,7 +107,8 @@ and br.`property_contract_id` = #{propertyContractId} and br.`pay_way` = #{payWay} and br.`late_pay_status` = #{latePayStatus} - + and br.`late_pay_status` = #{latePayStatus} + and d.`status` = #{depositStatus} order by ${sortColumns}