|
|
|
@@ -479,7 +479,7 @@ public class WxRentContractHelper { |
|
|
|
} |
|
|
|
|
|
|
|
//其他标准计费项 |
|
|
|
public static List<WxBillFeesStandardsListVo> getStandardsBillList(Integer decimalSize,List<WxEnergyFees> feesStandarsList,Date billStartDate,Date billEndDate,boolean isFixed) { |
|
|
|
public static List<WxBillFeesStandardsListVo> getStandardsBillList(Integer decimalSize,List<WxEnergyFees> feesStandarsList,Date billStartDate,Date billEndDate,boolean isFixed,String rentArea) { |
|
|
|
if (null == feesStandarsList || feesStandarsList.size() <= 0 ) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
@@ -493,7 +493,11 @@ public class WxRentContractHelper { |
|
|
|
if (fees.getFixedPrice().intValue() == EnumYesOrNo.YES.getCode().intValue() && null != billStartDate && null != billEndDate) { |
|
|
|
vo.setStart(billStartDate); |
|
|
|
vo.setEnd(billEndDate); |
|
|
|
vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, "1",true,null,null)); |
|
|
|
String count = "1"; |
|
|
|
if (null != fees.getCalcuteUnit() && fees.getCalcuteUnit().intValue() == EnumFeesStandardsCalcuteUnit.MM.getCode().intValue()) { |
|
|
|
count = rentArea; |
|
|
|
} |
|
|
|
vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, count,true,null,null)); |
|
|
|
vo.setReceiveDate(DateUtils.getDaySet(billStartDate,Calendar.DATE,-1)); |
|
|
|
vo.setFeeStandards(fees); |
|
|
|
retList.add(vo); |
|
|
|
|