From 89e9a4c2b12bf063c9da0e0069fc334d271e62ca Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 24 May 2024 21:17:53 +0800 Subject: [PATCH] fix --- .../controller/rent/WxBillAllController.java | 5 +++ .../service/helper/WxBillAllHelper.java | 40 +++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index a62c06305..482ffc25f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -132,6 +132,11 @@ public class WxBillAllController extends BillBaseController { vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe())); + vo.setMinDate(billAllHelper.getMinDate(rentSum.getMinDate(),rentManageSum.getMinDate(),rentDepositSum.getMinDate(),propertySum.getMinDate(), + propertyDepositSum.getMinDate(),dailySum.getMinDate(),otherSum.getMinDate(),otherDepositSum.getMinDate())); + vo.setMaxDate(billAllHelper.getMaxDate(rentSum.getMaxDate(),rentManageSum.getMaxDate(),rentDepositSum.getMaxDate(),propertySum.getMaxDate(), + propertyDepositSum.getMaxDate(),dailySum.getMaxDate(),otherSum.getMaxDate(),otherDepositSum.getMaxDate())); + retList.add(vo); } diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index e8f1aeb25..9232b56a3 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -406,6 +406,46 @@ public class WxBillAllHelper { return "0"; } + public Date getMinDate(Date... date) { + if (null != date && date.length > 0 ) { + Date minDate = null; + for (int i =0 ; i < date.length; i ++) { + Date ndate = date[i]; + if (null != ndate) { + if (null == minDate) { + minDate = ndate; + }else { + if (minDate.after(ndate)) { + minDate = ndate; + } + } + } + } + return minDate; + } + return null; + } + + public Date getMaxDate(Date... date) { + if (null != date && date.length > 0 ) { + Date maxDate = null; + for (int i =0 ; i < date.length; i ++) { + Date ndate = date[i]; + if (null != ndate) { + if (null == maxDate) { + maxDate = ndate; + }else { + if (maxDate.before(ndate)) { + maxDate = ndate; + } + } + } + } + return maxDate; + } + return null; + } + public String getMerchantShopNumber(WxMerchant merchant) { List shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId()); if (null != shopList && shopList.size() > 0 ) {