| @@ -132,6 +132,11 @@ public class WxBillAllController extends BillBaseController { | |||||
| vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), | vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), | ||||
| propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.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); | retList.add(vo); | ||||
| } | } | ||||
| @@ -406,6 +406,46 @@ public class WxBillAllHelper { | |||||
| return "0"; | 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) { | public String getMerchantShopNumber(WxMerchant merchant) { | ||||
| List<WxShopVo> shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId()); | List<WxShopVo> shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId()); | ||||
| if (null != shopList && shopList.size() > 0 ) { | if (null != shopList && shopList.size() > 0 ) { | ||||