|
|
|
@@ -1910,16 +1910,25 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
timeVo.setEndDate(EnumContractReceivePeriodUnit.getAfterCalendarNarDay(timeVo.getStartDate(), receivePeriod, dayType));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (count >= 12) {
|
|
|
|
String a = "";
|
|
|
|
}
|
|
|
|
|
|
|
|
//如果是到了每年的截止时间,第一年忽略(是开始时间)
|
|
|
|
if (null != yearsEndList && yearsEndList.size() > 0 ) {
|
|
|
|
Date yearEndDate = yearsEndList.get(0);
|
|
|
|
yearEndDate = DateUtils.getDayEnd(yearEndDate);
|
|
|
|
if (timeVo.getEndDate().after(yearEndDate)) {
|
|
|
|
timeVo.setEndDate(yearEndDate);
|
|
|
|
yearsEndList.remove(yearEndDate);
|
|
|
|
}else if(timeVo.getEndDate().equals(yearEndDate)) {
|
|
|
|
yearsEndList.remove(yearEndDate);
|
|
|
|
Date yearEndDateStart = yearsEndList.get(0);
|
|
|
|
if (timeVo.getStartDate().equals(yearEndDateStart)) {
|
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
|
}else if (timeVo.getStartDate().after(yearEndDateStart)) {
|
|
|
|
//do nothing
|
|
|
|
}else if (timeVo.getStartDate().before(yearEndDateStart)) {
|
|
|
|
Date yearEndDateEnd = DateUtils.getDayEnd(yearEndDateStart);
|
|
|
|
if (timeVo.getEndDate().after(yearEndDateEnd)) {
|
|
|
|
timeVo.setEndDate(yearEndDateEnd);
|
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
|
}else if(timeVo.getEndDate().equals(yearEndDateEnd)) {
|
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|