|
|
|
@@ -912,6 +912,7 @@ public class WxRentContractHelper { |
|
|
|
//如果是第一期,则取当前的周期 |
|
|
|
if (null == currentReceiveDate) { |
|
|
|
startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, 0, EnumContractReceivePeriodUnit.QUARTER.getCode()); |
|
|
|
startDate = DateUtils.getSecondsTimeAfter(1, startDate); |
|
|
|
}else { |
|
|
|
startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, -1*receivePeriod*payPeriodRate, EnumContractReceivePeriodUnit.QUARTER.getCode()); |
|
|
|
} |
|
|
|
@@ -934,7 +935,14 @@ public class WxRentContractHelper { |
|
|
|
vo.setEndDate(endDate); |
|
|
|
return vo; |
|
|
|
}else { |
|
|
|
Date startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, -1*receivePeriod*payPeriodRate, dayType); |
|
|
|
Date startDate = null; |
|
|
|
//如果是第一期,则取当前的周期 |
|
|
|
if (null == currentReceiveDate) { |
|
|
|
startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, 0, dayType); |
|
|
|
startDate = DateUtils.getSecondsTimeAfter(1, startDate); |
|
|
|
}else { |
|
|
|
startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, -1*receivePeriod*payPeriodRate, dayType); |
|
|
|
} |
|
|
|
startDate = DateUtils.getFirstDayForCurrMonth(start); |
|
|
|
vo.setStartDate(startDate); |
|
|
|
vo.setEndDate(end); |
|
|
|
|