|
|
@@ -1330,10 +1330,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
long needpay = 0; |
|
|
long needpay = 0; |
|
|
|
|
|
|
|
|
boolean flag = false; |
|
|
boolean flag = false; |
|
|
Long bmpricePre = null; |
|
|
|
|
|
Long bmPrce = null; |
|
|
|
|
|
Long ompricePre = null; |
|
|
|
|
|
Long omPrce = null; |
|
|
|
|
|
|
|
|
long bmpricePre = 0; |
|
|
|
|
|
long bmPrce = 0; |
|
|
|
|
|
long ompricePre = 0; |
|
|
|
|
|
long omPrce = 0; |
|
|
//此处逻辑处理这一年和下一年交接那一期账单。 |
|
|
//此处逻辑处理这一年和下一年交接那一期账单。 |
|
|
if(yearList.size() > 1) { |
|
|
if(yearList.size() > 1) { |
|
|
if (endDate!=null && (sd.format(billTimeVo.getStartDate()).equals(sd.format(endDate)) || billTimeVo.getStartDate().after(endDate) || billTimeVo.getEndDate().after(endDate) )) { |
|
|
if (endDate!=null && (sd.format(billTimeVo.getStartDate()).equals(sd.format(endDate)) || billTimeVo.getStartDate().after(endDate) || billTimeVo.getEndDate().after(endDate) )) { |
|
|
|