winter 1 год назад
Родитель
Сommit
7560b25945
1 измененных файлов: 5 добавлений и 7 удалений
  1. +5
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 5
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -714,6 +714,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
} }
} }
Date firstBillStartDate = null;
Date firstBillEndDate = null;
if (null != billTimeVoList && billTimeVoList.size() > 0 ) { if (null != billTimeVoList && billTimeVoList.size() > 0 ) {
BillTimeVo firstBillTime = billTimeVoList.get(0); BillTimeVo firstBillTime = billTimeVoList.get(0);
WxPropertyContract cupdate = new WxPropertyContract(); WxPropertyContract cupdate = new WxPropertyContract();
@@ -723,17 +725,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
cupdate.setFirstBillDateEnd(firstBillTime.getEndDate()); cupdate.setFirstBillDateEnd(firstBillTime.getEndDate());
cupdate.setDecimalSize(null);//去掉默认的,避免更新 cupdate.setDecimalSize(null);//去掉默认的,避免更新
wxPropertyContractMapper.updateById(cupdate); wxPropertyContractMapper.updateById(cupdate);
firstBillStartDate = firstBillTime.getStartDate();
firstBillEndDate = firstBillTime.getEndDate();
} }
//结算其他金额 //结算其他金额
Date billStartDate = null;
Date billEndDate = null;
if (billTimeVoList.size() > 0 ) {
billStartDate = billTimeVoList.get(0).getStartDate();
billEndDate = billTimeVoList.get(billTimeVoList.size()-1).getEndDate();
}
//一次性费用的,只有一个账单。 //一次性费用的,只有一个账单。
List<WxBillFeesStandardsListVo> fixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),billStartDate,billEndDate,true,wxPropertyContract.getRentArea());
List<WxBillFeesStandardsListVo> fixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),firstBillStartDate,firstBillEndDate,true,wxPropertyContract.getRentArea());


int index = 0; int index = 0;


Загрузка…
Отмена
Сохранить