diff --git a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java index 558e802..f4d57a9 100644 --- a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java @@ -1081,13 +1081,15 @@ public class AnalysisReportServiceImpl implements IAnalysisReportService { connectedTransItem.setName(counterpartyName); //直接关系:从A的银行流水,及交易对象表格查找 A的银行流水中直接出现了B的名字 开始 - if (tpBsCNameAndCardMap.keySet().contains(counterpartyName)) { + if (tpBsCNameAndCardMap.keySet().contains(counterpartyName) || tpCardHolderNameSet.contains(counterpartyName)) { connectedTransItem.setRemark("直接关联,仅名称相同,需确认"); if (CollectionUtil.isNotEmpty(mainCounterpartyAccountSet)) { Set tempCardSet = tpBsCNameAndCardMap.get(counterpartyName); - mainCounterpartyAccountSet.retainAll(tempCardSet); - if (CollectionUtil.isNotEmpty(mainCounterpartyAccountSet)) {//取交集 - connectedTransItem.setRemark("直接关联,名称和卡号相同"); + if(CollectionUtil.isNotEmpty(tempCardSet)){ + mainCounterpartyAccountSet.retainAll(tempCardSet); + if (CollectionUtil.isNotEmpty(mainCounterpartyAccountSet)) {//取交集 + connectedTransItem.setRemark("直接关联,名称和卡号相同"); + } } } connectedTransactionCommonMethod(tpMap,counterpartyName,connectedTransItem,counterpartyNameMainList); @@ -1315,6 +1317,13 @@ public class AnalysisReportServiceImpl implements IAnalysisReportService { } + /** + * 对象build + * @param tpMap + * @param counterpartyName + * @param connectedTransItem + * @param mainList + */ void connectedTransactionCommonMethod(Map tpMap,String counterpartyName, AnalysisReportVo.ConnectedTransItem connectedTransItem, List mainList){ @@ -1445,10 +1454,23 @@ public class AnalysisReportServiceImpl implements IAnalysisReportService { List tpList = result.getBeanList("dc_transaction_partner", TransactionPartner.class); for (TransactionPartner transactionPartner : tpList) { StringBuilder tpSb = new StringBuilder(); - tpSb.append(transactionPartner.getTravellingTrader()).append(","); - tpSb.append(transactionPartner.getStockholder()).append(","); - tpSb.append(transactionPartner.getStockholderRelated()).append(","); - tpSb.append(transactionPartner.getRelateCompany()).append(","); + String travellingTrader = transactionPartner.getTravellingTrader(); + String stockholder = transactionPartner.getStockholder(); + String stockholderRelated = transactionPartner.getStockholderRelated(); + String relateCompany = transactionPartner.getRelateCompany(); + + if(StrUtil.isNotEmpty(travellingTrader)){ + tpSb.append(travellingTrader).append(","); + } + if(StrUtil.isNotEmpty(stockholder)){ + tpSb.append(stockholder).append(","); + } + if(StrUtil.isNotEmpty(stockholderRelated)){ + tpSb.append(stockholderRelated).append(","); + } + if(StrUtil.isNotEmpty(relateCompany)){ + tpSb.append(relateCompany).append(","); + } String key = tpSb.toString(); tpMap.put(key, transactionPartner); }