From da1530295a3f4e71073b4d6005eb0deea14647f0 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Wed, 23 Oct 2024 13:57:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=A1=E7=94=A8=E5=8D=A1=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/invest/domain/vo/CreditCardBillVo.java | 3 +++ .../invest/service/impl/CreditCardBillServiceImpl.java | 10 ++++++++++ .../resources/mapper/invest/CreditCardBillMapper.xml | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java index 914c9b6..4c52f82 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java @@ -26,5 +26,8 @@ public class CreditCardBillVo extends CreditCardBill @Excel(name = "信用卡") private String bankNameCode; + @ApiModelProperty(value="POS刷卡占比)") + private String posRate; + } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java index c5f38a4..bd2d6c4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java @@ -14,6 +14,7 @@ import com.ruoyi.invest.service.ICreditCardBillService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -58,10 +59,19 @@ public class CreditCardBillServiceImpl implements ICreditCardBillService { List creditCardBillList=creditCardBillMapper.selectCreditCardBillList(creditCardBillDto); //修改名称加卡号 + DecimalFormat decimalFormat = new DecimalFormat("#.###"); for (CreditCardBillVo creditCardBill : creditCardBillList) { if(creditCardBill.getBankName()!=null){ creditCardBill.setBankNameCode(creditCardBill.getBankName()+"（"+ StringUtils.getLastNumberChars(4,creditCardBill.getBankCode()+"）")); } + int totalCount=Integer.parseInt(creditCardBill.getPosCount())+Integer.parseInt(creditCardBill.getDailyExpensesCount()); + if(totalCount>0){ + String posRate=decimalFormat.format((Integer.parseInt(creditCardBill.getPosCount())* 100L)/totalCount)+"%"; + creditCardBill.setPosRate(posRate); + }else{ + creditCardBill.setPosRate("--"); + } + } return creditCardBillList; } diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml index 4f89053..7676a63 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 2)>= to_char(adr.create_time, 'yyyy-MM-dd') and adr.deal_category = '5' - + and adr.del_flag='0' ) as pos_count, ( select @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 2)>= to_char(adr.create_time, 'yyyy-MM-dd') and adr.deal_category = '1' - + and adr.del_flag='0' ) as daily_expenses_count from credit_card_bill a