|
@@ -434,6 +434,7 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
|
|
|
//reportFeeMonthStatisticsPo.setReceivableAmount(receivableAmount + "");
|
|
//reportFeeMonthStatisticsPo.setReceivableAmount(receivableAmount + "");
|
|
|
reportFeeMonthStatisticsPo.setReceivedAmount(receivedAmount + "");
|
|
reportFeeMonthStatisticsPo.setReceivedAmount(receivedAmount + "");
|
|
|
reportFeeMonthStatisticsPo.setOweAmount(oweAmount + "");
|
|
reportFeeMonthStatisticsPo.setOweAmount(oweAmount + "");
|
|
|
|
|
+ reportFeeMonthStatisticsPo.setFeeId(tmpReportFeeDto.getFeeId());
|
|
|
reportFeeMonthStatisticsPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
|
|
reportFeeMonthStatisticsPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
|
|
|
reportFeeMonthStatisticsPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
|
|
reportFeeMonthStatisticsPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
|
|
|
reportFeeMonthStatisticsServiceDaoImpl.updateReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
|
|
reportFeeMonthStatisticsServiceDaoImpl.updateReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
|
|
@@ -590,7 +591,7 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
|
|
|
ReportFeeDetailDto feeDetailDto = new ReportFeeDetailDto();
|
|
ReportFeeDetailDto feeDetailDto = new ReportFeeDetailDto();
|
|
|
feeDetailDto.setStartTime(DateUtil.getFormatTimeString(DateUtil.getFirstDate(), DateUtil.DATE_FORMATE_STRING_A));
|
|
feeDetailDto.setStartTime(DateUtil.getFormatTimeString(DateUtil.getFirstDate(), DateUtil.DATE_FORMATE_STRING_A));
|
|
|
feeDetailDto.setEndTime(DateUtil.getFormatTimeString(DateUtil.getNextMonthFirstDate(), DateUtil.DATE_FORMATE_STRING_A));
|
|
feeDetailDto.setEndTime(DateUtil.getFormatTimeString(DateUtil.getNextMonthFirstDate(), DateUtil.DATE_FORMATE_STRING_A));
|
|
|
- feeDetailDto.setFeeId(tmpReportFeeDto.getFeeId());
|
|
|
|
|
|
|
+ feeDetailDto.setConfigId(tmpReportFeeDto.getConfigId());
|
|
|
double receivedAmount = reportFeeServiceDaoImpl.getFeeReceivedAmount(feeDetailDto);
|
|
double receivedAmount = reportFeeServiceDaoImpl.getFeeReceivedAmount(feeDetailDto);
|
|
|
|
|
|
|
|
return receivedAmount;
|
|
return receivedAmount;
|