|
@@ -234,6 +234,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
|
|
|
BigDecimal toDayFee = new BigDecimal(0);
|
|
|
BigDecimal allDayFee = new BigDecimal(0);
|
|
|
+ BigDecimal allParkFee = new BigDecimal(0);
|
|
|
List<ExportFeeDetailDTO> exportList = new ArrayList<>();
|
|
|
List<TbFeeDetails> list = this.getList(so);
|
|
|
Integer index = 1;
|
|
@@ -255,15 +256,17 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
detailDTO.setBusinessNo(feeDetails.getBusinessCarNo());
|
|
|
}
|
|
|
exportList.add(detailDTO);
|
|
|
- if(checkTimeRange(beginTime, endTime, feeDetails.getCreateTime()) && feeDetails.getFeeType()==TbFeeDetails.fee.PARK_FEE.getCode()){
|
|
|
+ if(checkTimeRange(nowStr, nowStr, feeDetails.getCreateTime()) && feeDetails.getFeeType()==TbFeeDetails.fee.PARK_FEE.getCode()){
|
|
|
toDayFee = toDayFee.add(feeDetails.getItemPrice());
|
|
|
}
|
|
|
if(feeDetails.getFeeType()==TbFeeDetails.fee.PARK_FEE.getCode()){
|
|
|
- allDayFee = allDayFee.add(feeDetails.getItemPrice());
|
|
|
+ allParkFee = allParkFee.add(feeDetails.getItemPrice());
|
|
|
}
|
|
|
+ allDayFee = allDayFee.add(feeDetails.getItemPrice());
|
|
|
}
|
|
|
|
|
|
head.put("toDayFee", toDayFee.toString());
|
|
|
+ head.put("allParkFee", allParkFee.toString());
|
|
|
head.put("allDayFee", allDayFee.toString());
|
|
|
|
|
|
String separator = File.separator;
|