|
|
|
@@ -1025,7 +1025,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
@Override
|
|
|
|
public List<Date> getYearList(int years,int month,Date rentalStartDate,Date endContractTime ) {
|
|
|
|
List<Date> yearList = new ArrayList<>();
|
|
|
|
List<Date> yearList = new ArrayList<Date>();
|
|
|
|
for (int i = 0; i < years; i++) {
|
|
|
|
Calendar instance = Calendar.getInstance();
|
|
|
|
instance.setTime(rentalStartDate);
|
|
|
|
@@ -1033,6 +1033,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
Date startDate = instance.getTime();
|
|
|
|
if (null != endContractTime && endContractTime.before(startDate)) {
|
|
|
|
yearList.add(endContractTime);
|
|
|
|
break;
|
|
|
|
}else {
|
|
|
|
yearList.add(startDate);
|
|
|
|
}
|
|
|
|
|