diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java index 81fd22c..8bd892f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java @@ -1277,9 +1277,17 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { if(staticsTime.equals(monthString)){ double total=vo.getInstallmentAmount()+vo.getTotalInterest(); + BigDecimal bigInstallmentAmount=new BigDecimal(decimalFormat.format( vo.getInstallmentAmount())); + BigDecimal bigTotalInterest=new BigDecimal(decimalFormat.format( vo.getTotalInterest())); BigDecimal bigDecimal=new BigDecimal(decimalFormat.format( total)); actualCreditBillMonth+=bigDecimal.doubleValue(); - details+=vo.getBankNameCode()+"借款金额(本息)"+bigDecimal.doubleValue()+";
"; + //2是信用卡,3是网贷 + if(vo.getType().equals("2")){ + details+=vo.getBankNameCode()+"于"+dateFormat.format(vo.getInstallmentDate())+"分期"+bigInstallmentAmount.doubleValue()+",利息"+bigTotalInterest.doubleValue()+",分期本息合计"+bigDecimal.doubleValue()+",结清日期"+dateFormat.format(vo.getCloseDate())+";
"; + } + if(vo.getType().equals("3")){ + details+=vo.getBankNameCode()+"于"+dateFormat.format(vo.getInstallmentDate())+"借款"+bigInstallmentAmount.doubleValue()+",利息"+bigTotalInterest.doubleValue()+",借款本息合计"+bigDecimal.doubleValue()+",结清日期"+dateFormat.format(vo.getCloseDate())+";
"; + } } }