From ecb885858c9642636c4eacca7734e506a2406383 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 24 May 2024 20:49:59 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/vo/WxBillSum.java | 4 ++++ .../java/com/iformall/domain/vo/WxMerchantBillVo.java | 8 ++++++++ .../src/main/resources/mapper/WxBillDailyMapper.xml | 9 ++++++++- .../src/main/resources/mapper/WxBillDepositMapper.xml | 9 ++++++++- .../main/resources/mapper/WxBillOtherDepositMapper.xml | 9 ++++++++- .../src/main/resources/mapper/WxBillOtherMapper.xml | 9 ++++++++- .../resources/mapper/WxBillPropertyDepositMapper.xml | 9 ++++++++- .../src/main/resources/mapper/WxBillPropertyMapper.xml | 9 ++++++++- .../src/main/resources/mapper/WxBillRentManageMapper.xml | 9 ++++++++- .../src/main/resources/mapper/WxBillRentMapper.xml | 9 ++++++++- 10 files changed, 76 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index 5ee1e7e8a..6a9caea85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.Date; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.annotation.TableField; @@ -27,6 +28,9 @@ public class WxBillSum implements Serializable { @TableField(exist = false) private BigDecimal oweNumber; + private Date minDate; + private Date maxDate; + public BigDecimal getNeedPayNumber() { if (StringUtils.isNotBlank(needPay)) { this.needPayNumber = new BigDecimal(needPay); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index 748dfc512..8e04c6322 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -9,6 +9,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.Date; import java.util.List; @Data @@ -49,6 +50,13 @@ public class WxMerchantBillVo implements Serializable { return StringUtils.isBlank(owe) ? "0" : new BigDecimal(owe).toPlainString(); } + + @Excel(name = "账单最小日期", width = 20, orderNum = "7") + private Date minDate; + + @Excel(name = "账单最大日期", width = 20, orderNum = "8") + private Date maxDate; + @TableField(exist = false) private List billSumList; diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 604977e64..e63c38e5c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -139,9 +139,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 28cb953c0..e4c86e643 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -171,9 +171,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 843d8eb19..6409eb088 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -143,9 +143,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 0cec0599b..8803dc1c6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -138,9 +138,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index a119834ce..e06e892ae 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -146,9 +146,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index f15656dfa..c37bf1a40 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -188,9 +188,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index 073572e4e..80de88677 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -165,9 +165,16 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index d84d208d8..5d9a4b91d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -188,9 +188,16 @@ + +