From 321b4f028ee02cb733c7a23145c57bd060ef02aa Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Tue, 21 May 2024 13:27:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=B0=E8=B4=A6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90=EF=BC=8C=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StatisticAnalysisImpl.java | 25 +++++++++++++------ .../mapper/invest/StatisticAnalysisMapper.xml | 7 +++++- 2 files changed, 23 insertions(+), 9 deletions(-) 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 cc64b4e..6749912 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 @@ -1493,7 +1493,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { String dayString=dateFormat.format(vo.getCreateTime()); if(staticsTime.equals(dayString)){ actualCreditBillDay+=vo.getAmount(); - details+=vo.getOutAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"刷卡"+vo.getAmount()+"；
"; + details+=vo.getOutAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"在商户【"+vo.getMerchantName()+"】通过POS机【"+vo.getPosName()+"】刷卡消费"+vo.getAmount()+"，其中手续费为"+vo.getCommission()+"，入账储蓄卡"+vo.getInAccountName()+vo.getActualAmount()+"；
"; } } AccountsTransferRecordVo analysisVo=new AccountsTransferRecordVo(); @@ -1764,15 +1764,20 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { String dayString=dateFormat.format(vo.getCreateTime()); if(staticsTime.equals(dayString)){ + String remark=""; + if(vo.getRemark()!=null&&StringUtils.isNotEmpty(vo.getRemark())){ + remark+="，备注："+vo.getRemark(); + } if(vo.getDealType().equals("1")){ if(analysisDto.getDataType().equals("5")){ if(vo.getDealCategory().equals("2")){ actualCreditBillDay+=vo.getAmount(); - details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易盈利"+vo.getAmount()+"；
"; + details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易盈利"+vo.getAmount()+remark+"；
"; } } else { actualCreditBillDay+=vo.getAmount(); - details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+"；
"; + + details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+remark+"；
"; } } @@ -1780,11 +1785,11 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { if(analysisDto.getDataType().equals("5")){ if(vo.getDealCategory().equals("2")){ actualCreditBillDay-=vo.getAmount(); - details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易亏损"+vo.getAmount()+"；
"; + details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易亏损"+vo.getAmount()+remark+"；
"; } } else { actualCreditBillDay-=vo.getAmount(); - details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+"；
"; + details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+remark+"；
"; } } @@ -2051,13 +2056,17 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { String dayString=dateFormat.format(vo.getCreateTime()); if(staticsTime.equals(dayString)){ + String remark=""; + if(vo.getRemark()!=null&&StringUtils.isNotEmpty(vo.getRemark())){ + remark+="，备注："+vo.getRemark(); + } if(vo.getDealType().equals("1")){ - actualCreditBillDay+=vo.getAmount(); - details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+"；
"; + actualCreditBillDay+=vo.getAmount(); + details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+remark+"；
"; } if(vo.getDealType().equals("2")){ actualCreditBillDay-=vo.getAmount(); - details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+"；
"; + details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+remark+"；
"; } } } diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml index 9570021..6e02334 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml @@ -82,6 +82,7 @@ atr.create_time , atr.pos_id as account_id , atr.create_by, + atr.remark, p."name" as account_name , p.code from @@ -103,6 +104,7 @@ ihd.repayment_date as create_time, ihd.bank_card_lend_id as account_id , ihd.create_by, + ihd.remark, a."name" as account_name , a.code from @@ -120,6 +122,7 @@ adr.create_time , adr.account_id , adr.create_by, + adr.remark, a."name" as account_name , a.code from @@ -128,9 +131,11 @@ a.id = adr.account_id where adr.del_flag = '0' - and adr.deal_category = '1' + and ( + adr.deal_category = '1' or adr.deal_category = '2' or adr.deal_category = '11' + ) ) a 1=1