diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSuspiciousTransactionQueryDTO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSuspiciousTransactionQueryDTO.java index 2cc9e6e1..2babf192 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSuspiciousTransactionQueryDTO.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSuspiciousTransactionQueryDTO.java @@ -11,6 +11,9 @@ public class CcdiProjectSuspiciousTransactionQueryDTO { /** 项目ID */ private Long projectId; + /** 模型编码 */ + private String modelCode; + /** 涉疑类型 */ private String suspiciousType; diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java index 1d7e92ff..aaa12823 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java @@ -625,6 +625,11 @@ public class CcdiProjectOverviewServiceImpl implements ICcdiProjectOverviewServi } private void normalizeSuspiciousTransactionQuery(CcdiProjectSuspiciousTransactionQueryDTO queryDTO) { + if (queryDTO.getModelCode() != null && !queryDTO.getModelCode().isBlank()) { + queryDTO.setModelCode(queryDTO.getModelCode().trim().toUpperCase()); + } else { + queryDTO.setModelCode(null); + } if (queryDTO.getSuspiciousType() == null || queryDTO.getSuspiciousType().isBlank()) { queryDTO.setSuspiciousType("ALL"); return; diff --git a/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml index facf2e2e..076abb30 100644 --- a/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml +++ b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml @@ -972,6 +972,9 @@ from ccdi_bank_statement_tag_result tr where tr.project_id = #{query.projectId} and tr.bank_statement_id is not null + + and tr.model_code = #{query.modelCode} + @@ -1203,6 +1206,15 @@ where final_result.hasModelRuleHit = 1 or final_result.hasNameListHit = 1 + + and exists ( + select 1 + from ccdi_bank_statement_tag_result model_filter + where model_filter.project_id = #{query.projectId} + and model_filter.bank_statement_id = final_result.bankStatementId + and model_filter.model_code = #{query.modelCode} + ) +