|
|
|
@@ -1914,6 +1914,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//如果是到了每年的截止时间,第一年忽略(是开始时间)
|
|
|
|
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);
|
|
|
|
|