diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java index b45bbf4..cd86281 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java @@ -61,10 +61,15 @@ public class Accounts extends BaseEntity /** 账户主键 */ private Long accountId; + /** 账户显示隐藏状态 */ + @ApiModelProperty(value="账户显示隐藏状态") + @Excel(name = "账户显示隐藏状态") + private String state; + /** 账户状态 */ @ApiModelProperty(value="账户状态") @Excel(name = "账户状态") - private String state; + private String status; @Override public String toString() { @@ -84,6 +89,7 @@ public class Accounts extends BaseEntity .append("remark", getRemark()) .append("accountId", getAccountId()) .append("state", getState()) + .append("status", getStatus()) .toString(); } } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java index 9b87c42..6d5f7c7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java @@ -126,6 +126,10 @@ public class BankCardLend extends BaseEntity @ApiModelProperty(value="可用额度") private Double availableLimit; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + @Excel(name = "账户状态") + private String status; @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -154,6 +158,7 @@ public class BankCardLend extends BaseEntity .append("isZeroBill", getIsZeroBill()) .append("balance", getBalance()) .append("availableLimit", getAvailableLimit()) + .append("status", getStatus()) .toString(); } } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java index 7f5039d..12493c1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java @@ -90,6 +90,11 @@ public class FutureStocks extends BaseEntity @ApiModelProperty(value="可用额度") private Double availableLimit; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + @Excel(name = "账户状态") + private String status; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -113,6 +118,7 @@ public class FutureStocks extends BaseEntity .append("remark", getRemark()) .append("balance", getBalance()) .append("availableLimit", getAvailableLimit()) + .append("status", getStatus()) .toString(); } } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java index 88c669e..dc8ddd5 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java @@ -83,6 +83,11 @@ public class PosMachine extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date activationDate; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + @Excel(name = "账户状态") + private String status; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -105,6 +110,7 @@ public class PosMachine extends BaseEntity .append("merchantCode", getMerchantCode()) .append("activationDate", getActivationDate()) .append("ratePlus", getRatePlus()) + .append("status", getStatus()) .toString(); } } 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 95e1935..8206184 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 @@ -27,11 +27,15 @@ public class AccountsDto extends BaseEntity implements Serializable private String type; /** 账户状态 */ - @ApiModelProperty(value="账户状态") + @ApiModelProperty(value="账户显示隐藏状态") private String state; /** 账户状态 */ @ApiModelProperty(value="账户id") private Long accountId; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + private String status; + } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java index 15558d2..82211d4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java @@ -42,4 +42,8 @@ public class BankCardLendDto extends BaseEntity implements Serializable @ApiModelProperty(value="信用卡id") private Long creditCardId; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + private String status; + } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java index 2efad0c..5889dbb 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java @@ -26,4 +26,8 @@ public class FutureStocksDto extends BaseEntity implements Serializable @ApiModelProperty(value="类型,1期货,2股票") private String type; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + private String status; + } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java index 3da4db2..d851e4d 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java @@ -30,4 +30,8 @@ public class PosMachineDto extends BaseEntity implements Serializable @ApiModelProperty(value="商户名称") private String merchantName; + /** 账户状态 */ + @ApiModelProperty(value="账户状态") + private String status; + } 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 92045f8..e2d96d9 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 @@ -94,14 +94,26 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { //返回数据 HashMap map = new HashMap<>(); //Pos机 - map.put("posCount",posMachineMapper.selectPosMachineList(new PosMachineDto()).size()); + PosMachineDto posMachineDto=new PosMachineDto(); + //状态为正常使用 + posMachineDto.setStatus("1"); + map.put("posCount",posMachineMapper.selectPosMachineList(posMachineDto).size()); BankCardLendDto bankCardLendDto=new BankCardLendDto(); + //状态为正常使用 + bankCardLendDto.setStatus("1"); bankCardLendDto.setType("2"); //信用卡 map.put("creditCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size()); bankCardLendDto.setType("1"); //储蓄卡 map.put("debitCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size()); + bankCardLendDto.setType("1"); + bankCardLendDto.setDebitType("1"); + //I类储蓄卡 + map.put("debitICount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size()); + bankCardLendDto.setDebitType("2"); + //II类储蓄卡 + map.put("debitIICount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size()); bankCardLendDto.setType("3"); bankCardLendDto.setLendType("1"); //网贷 @@ -112,6 +124,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { map.put("peopleLendCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size()); FutureStocksDto futureStocksDto=new FutureStocksDto(); + //状态为正常使用 + futureStocksDto.setStatus("1"); futureStocksDto.setType("1"); //期货 map.put("futuresCount",futureStocksMapper.selectFutureStocksList(futureStocksDto).size()); @@ -128,6 +142,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { DecimalFormat decimalFormat = new DecimalFormat("#.##"); AccountsDto dto=new AccountsDto(); + //状态正常,不隐藏 + dto.setStatus("1"); dto.setState("1"); //储蓄卡 dto.setType("1"); @@ -138,7 +154,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { } map.put("debetBalance",decimalFormat.format(debetBalance)); - dto.setState("1"); + //信用卡 dto.setType("2"); accountsList=accountsMapper.selectAccountsList(dto); @@ -336,7 +352,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { map.put("creditLimit",creditLimit); AccountsDto dto=new AccountsDto(); - dto.setState("1"); + //正常使用 + dto.setStatus("1"); //信用卡 dto.setType("2"); List accountsList=accountsMapper.selectAccountsList(dto); @@ -447,7 +464,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { map.put("creditCardCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size()); AccountsDto dto=new AccountsDto(); - dto.setState("1"); + //正常使用 + dto.setStatus("1"); //信用卡 dto.setType("2"); dto.setAccountId(analysisDto.getId()); @@ -1360,7 +1378,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { HashMap map = new HashMap<>(); DecimalFormat decimalFormat = new DecimalFormat("#.##"); AccountsDto dto=new AccountsDto(); - dto.setState("1"); + //正常使用 + dto.setStatus("1"); //储蓄卡 dto.setType("1"); List accountsList=accountsMapper.selectAccountsList(dto); 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 7b6a864..45c8522 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 @@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.remark, a.account_id, a.state, + a.status, bcl.bill_date , bcl.pay_date , bcl.credit_limit , @@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.name like '%'|| #{name}||'%' and a.type = #{type} and a.state = #{state} + and a.status = #{status} and a.account_id = #{accountId} @@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, account_id, state, + status, #{id}, @@ -107,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{accountId}, #{state}, + #{status}, @@ -127,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, account_id = #{accountId}, state = #{state}, + status = #{status}, where id = #{id} diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml index 80b418c..7ed8ff3 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.is_next_bill_date, a.next_bill_date_time, a.is_zero_bill, + a.status, t.balance, t.available_limit from bank_card_lend a @@ -73,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.debit_type = #{debitType} and a.id = #{creditCardId} and a.lend_type = #{lendType} + and a.status = #{status} ${params.dataScope} @@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_next_bill_date, next_bill_date_time, is_zero_bill, + status, #{id}, @@ -135,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isNextBillDate}, #{nextBillDateTime}, #{isZeroBill}, + #{status}, @@ -163,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_next_bill_date = #{isNextBillDate}, next_bill_date_time = #{nextBillDateTime}, is_zero_bill = #{isZeroBill}, + status = #{status}, where id = #{id} diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml index 9a074e7..209bbc1 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.update_time, a.del_flag, a.remark , + a.status, bc."name" as bank_name, bc.code as bank_code, t.balance, @@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.del_flag='0' and a.name like '%'|| #{name}||'%' and a.type = #{type} + and a.status = #{status} ${params.dataScope} @@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, del_flag, remark, + status, #{id}, @@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{delFlag}, #{remark}, + #{status}, @@ -141,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, del_flag = #{delFlag}, remark = #{remark}, + status = #{status}, where id = #{id} diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml index 74a4726..91e3a0d 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.merchant_type, a.merchant_code, a.activation_date, + a.status, bc."name" as bank_name, bc.code as bank_code from @@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.del_flag='0' and a.name like '%'|| #{name}||'%' and a.type = #{type} + and a.status = #{status} and a.merchant_name like '%'|| #{merchantName}||'%' @@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" merchant_type, merchant_code, activation_date, + status, #{id}, @@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{merchantType}, #{merchantCode}, #{activationDate}, + #{status}, @@ -142,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" merchant_type = #{merchantType}, merchant_code = #{merchantCode}, activation_date = #{activationDate}, + status = #{status}, where id = #{id}