From a70b727e17c7a39af8515fdcd9951eebdedf0b9e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 23 May 2024 17:24:34 +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=E7=BB=9F=E8=AE=A1=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/invest/domain/dto/AccountsDto.java    | 4 ++++
 .../com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java  | 1 +
 .../src/main/resources/mapper/invest/AccountsMapper.xml       | 1 +
 3 files changed, 6 insertions(+)

diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
index 8585ede..95e1935 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
@@ -30,4 +30,8 @@ public class AccountsDto extends BaseEntity implements Serializable
     @ApiModelProperty(value="账户状态")
     private String state;
 
+    /** 账户状态 */
+    @ApiModelProperty(value="账户id")
+    private Long accountId;
+
 }
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 cac5d55..08aeb9b 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
@@ -432,6 +432,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         dto.setState("1");
         //信用卡
         dto.setType("2");
+        dto.setAccountId(analysisDto.getId());
         List<AccountsVo> accountsList=accountsMapper.selectAccountsList(dto);
         double creditAvailableLimit =0;
         double creditBalance =0;
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
index 5cc4649..7b6a864 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and a.name like '%'|| #{name}||'%'</if>
             <if test="type != null  and type != ''"> and a.type = #{type}</if>
             <if test="state != null  and state != ''"> and a.state = #{state}</if>
+            <if test="accountId != null  and accountId != ''"> and a.account_id = #{accountId}</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}