|
|
|
@@ -874,7 +874,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
List<WxBillRent> resultList = new ArrayList<>(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
|
|
|
|
Date endDate = null; |
|
|
|
Date endDate = null;//每年的截止日期 |
|
|
|
if(yearList.size() > 1){ |
|
|
|
endDate = yearList.get(1); |
|
|
|
} |
|
|
|
@@ -894,8 +894,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if(index >= yearList.size()-1){ |
|
|
|
//endDate = wxRentContract.getRentalEndDate(); |
|
|
|
endDate = null; |
|
|
|
}else { |
|
|
|
endDate = yearList.get(index); |
|
|
|
}else{ |
|
|
|
endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 |
|
|
|
logger.info("==========cross:"+sd.format(endDate)); |
|
|
|
} |
|
|
|
|
|
|
|
|