|
|
|
@@ -557,16 +557,17 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
int index = 0; |
|
|
|
for (BillTimeVo billTimeVo : billTimeVoList){ |
|
|
|
if(yearList.size() > 1) { |
|
|
|
if (sd.format(billTimeVo.getStartDate()).equals(sd.format(endDate)) || billTimeVo.getStartDate().after(endDate)) { |
|
|
|
if (endDate!=null && (sd.format(billTimeVo.getStartDate()).equals(sd.format(endDate)) || billTimeVo.getStartDate().after(endDate))) { |
|
|
|
logger.info("=====billTimeVo.getStartDate():"+sd.format(billTimeVo.getStartDate())+" endDate:"+sd.format(endDate)); |
|
|
|
|
|
|
|
index++; |
|
|
|
if(index >= yearList.size()-1){ |
|
|
|
endDate = wxPropertyContract.getRentalEndDate(); |
|
|
|
//endDate = wxPropertyContract.getRentalEndDate(); |
|
|
|
endDate = null; |
|
|
|
}else { |
|
|
|
endDate = yearList.get(index); |
|
|
|
logger.info("==========cross:"+sd.format(endDate)); |
|
|
|
} |
|
|
|
logger.info("==========cross:"+sd.format(endDate)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|