qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 记账统计分析，功能优化。

Browse Source
This commit is contained in:
tianyongbao
2024-05-21 13:27:42 +08:00
parent 6831ed6f65
commit 321b4f028e
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
View File

@@ -1493,7 +1493,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
String dayString=dateFormat.format(vo.getCreateTime()); String dayString=dateFormat.format(vo.getCreateTime());
if(staticsTime.equals(dayString)){ if(staticsTime.equals(dayString)){
actualCreditBillDay+=vo.getAmount(); actualCreditBillDay+=vo.getAmount();
details+=vo.getOutAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"刷卡"+vo.getAmount()+"；<br/>"; details+=vo.getOutAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"在商户【"+vo.getMerchantName()+"】通过POS机【"+vo.getPosName()+"】刷卡消费"+vo.getAmount()+"，其中手续费为"+vo.getCommission()+"，入账储蓄卡"+vo.getInAccountName()+vo.getActualAmount()+"；<br/>";
} }
} }
AccountsTransferRecordVo analysisVo=new AccountsTransferRecordVo(); AccountsTransferRecordVo analysisVo=new AccountsTransferRecordVo();
@@ -1764,15 +1764,20 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
String dayString=dateFormat.format(vo.getCreateTime()); String dayString=dateFormat.format(vo.getCreateTime());
if(staticsTime.equals(dayString)){ if(staticsTime.equals(dayString)){
String remark="";
if(vo.getRemark()!=null&&StringUtils.isNotEmpty(vo.getRemark())){
remark+="，备注："+vo.getRemark();
}
if(vo.getDealType().equals("1")){ if(vo.getDealType().equals("1")){
if(analysisDto.getDataType().equals("5")){ if(analysisDto.getDataType().equals("5")){
if(vo.getDealCategory().equals("2")){ if(vo.getDealCategory().equals("2")){
actualCreditBillDay+=vo.getAmount(); actualCreditBillDay+=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易盈利"+vo.getAmount()+"；<br/>"; details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易盈利"+vo.getAmount()+remark+"；<br/>";
} }
} else { } else {
actualCreditBillDay+=vo.getAmount(); actualCreditBillDay+=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+"；<br/>";
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+remark+"；<br/>";
} }
} }
@@ -1780,11 +1785,11 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
if(analysisDto.getDataType().equals("5")){ if(analysisDto.getDataType().equals("5")){
if(vo.getDealCategory().equals("2")){ if(vo.getDealCategory().equals("2")){
actualCreditBillDay-=vo.getAmount(); actualCreditBillDay-=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易亏损"+vo.getAmount()+"；<br/>"; details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易亏损"+vo.getAmount()+remark+"；<br/>";
} }
} else { } else {
actualCreditBillDay-=vo.getAmount(); actualCreditBillDay-=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+"；<br/>"; details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+remark+"；<br/>";
} }
} }
@@ -2051,13 +2056,17 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
String dayString=dateFormat.format(vo.getCreateTime()); String dayString=dateFormat.format(vo.getCreateTime());
if(staticsTime.equals(dayString)){ if(staticsTime.equals(dayString)){
String remark="";
if(vo.getRemark()!=null&&StringUtils.isNotEmpty(vo.getRemark())){
remark+="，备注："+vo.getRemark();
}
if(vo.getDealType().equals("1")){ if(vo.getDealType().equals("1")){
actualCreditBillDay+=vo.getAmount(); actualCreditBillDay+=vo.getAmount();
details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+"；<br/>"; details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+remark+"；<br/>";
} }
if(vo.getDealType().equals("2")){ if(vo.getDealType().equals("2")){
actualCreditBillDay-=vo.getAmount(); actualCreditBillDay-=vo.getAmount();
details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+"；<br/>"; details+=vo.getNameCode()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+remark+"；<br/>";
} }
} }
} }

7
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml
View File

@@ -82,6 +82,7 @@
atr.create_time , atr.create_time ,
atr.pos_id as account_id , atr.pos_id as account_id ,
atr.create_by, atr.create_by,
atr.remark,
p."name" as account_name , p."name" as account_name ,
p.code p.code
from from
@@ -103,6 +104,7 @@
ihd.repayment_date as create_time, ihd.repayment_date as create_time,
ihd.bank_card_lend_id as account_id , ihd.bank_card_lend_id as account_id ,
ihd.create_by, ihd.create_by,
ihd.remark,
a."name" as account_name , a."name" as account_name ,
a.code a.code
from from
@@ -120,6 +122,7 @@
adr.create_time , adr.create_time ,
adr.account_id , adr.account_id ,
adr.create_by, adr.create_by,
adr.remark,
a."name" as account_name , a."name" as account_name ,
a.code a.code
from from
@@ -128,9 +131,11 @@
a.id = adr.account_id a.id = adr.account_id
where where
adr.del_flag = '0' adr.del_flag = '0'
and adr.deal_category = '1' and (
adr.deal_category = '1'
or adr.deal_category = '2' or adr.deal_category = '2'
or adr.deal_category = '11' or adr.deal_category = '11'
)
) a ) a
<where> <where>
1=1 1=1