|
@@ -3950,7 +3950,31 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
Set<String> names = searchVOMap.keySet();
|
|
Set<String> names = searchVOMap.keySet();
|
|
|
|
|
|
|
|
// 保险公司
|
|
// 保险公司
|
|
|
- Predicate<InsPlyIncomeDto> companyIdPredicate = insPlyIncome -> {
|
|
|
|
|
|
|
+// Predicate<InsPlyIncomeDto> companyIdPredicate = insPlyIncome -> {
|
|
|
|
|
+// if (!names.contains(FollowInvoicePageListVo.SearchVO.companyId)) {
|
|
|
|
|
+// return true;
|
|
|
|
|
+// }
|
|
|
|
|
+// FollowInvoicePageListVo.SearchVO searchVO = searchVOMap.get(FollowInvoicePageListVo.SearchVO.companyId);
|
|
|
|
|
+// String type = searchVO.getType();
|
|
|
|
|
+// String search = searchVO.getSearch();
|
|
|
|
|
+// if ("为空".equals(type) || "不为空".equals(type)) {
|
|
|
|
|
+// return true;
|
|
|
|
|
+// }
|
|
|
|
|
+// if (StrUtil.isEmpty(search)) {
|
|
|
|
|
+// return true;
|
|
|
|
|
+// }
|
|
|
|
|
+// if ("等于".equalsIgnoreCase(type) || "包含".equalsIgnoreCase(type)) {
|
|
|
|
|
+// List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
|
|
+// return companyIds.contains(insPlyIncome.getCompanyId());
|
|
|
|
|
+// }
|
|
|
|
|
+// if ("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)) {
|
|
|
|
|
+// List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
|
|
+// return !companyIds.contains(insPlyIncome.getCompanyId());
|
|
|
|
|
+// }
|
|
|
|
|
+// return true;
|
|
|
|
|
+// };
|
|
|
|
|
+ // 保险公司
|
|
|
|
|
+ Predicate<InsPlyIncomeDto> partnerCompanyIdPredicate = insPlyIncome -> {
|
|
|
if (!names.contains(FollowInvoicePageListVo.SearchVO.companyId)) {
|
|
if (!names.contains(FollowInvoicePageListVo.SearchVO.companyId)) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
@@ -3965,21 +3989,21 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
}
|
|
}
|
|
|
if ("等于".equalsIgnoreCase(type) || "包含".equalsIgnoreCase(type)) {
|
|
if ("等于".equalsIgnoreCase(type) || "包含".equalsIgnoreCase(type)) {
|
|
|
List<String> companyIds = Arrays.asList(search.split(","));
|
|
List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
- return companyIds.contains(insPlyIncome.getCompanyId());
|
|
|
|
|
|
|
+ return companyIds.contains(insPlyIncome.getPartnerCompanyId());
|
|
|
}
|
|
}
|
|
|
if ("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)) {
|
|
if ("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)) {
|
|
|
List<String> companyIds = Arrays.asList(search.split(","));
|
|
List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
- return !companyIds.contains(insPlyIncome.getCompanyId());
|
|
|
|
|
|
|
+ return !companyIds.contains(insPlyIncome.getPartnerCompanyId());
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
// AND / OR 组合逻辑(和代码A完全一致)
|
|
// AND / OR 组合逻辑(和代码A完全一致)
|
|
|
if ("and".equalsIgnoreCase(followInvoicePageListVo.getLogicJudge())) {
|
|
if ("and".equalsIgnoreCase(followInvoicePageListVo.getLogicJudge())) {
|
|
|
- Predicate<InsPlyIncomeDto> and = companyIdPredicate;
|
|
|
|
|
|
|
+ Predicate<InsPlyIncomeDto> and = partnerCompanyIdPredicate;
|
|
|
filterIncomes = incomes.stream().filter(and).toList();
|
|
filterIncomes = incomes.stream().filter(and).toList();
|
|
|
} else if ("or".equalsIgnoreCase(followInvoicePageListVo.getLogicJudge())) {
|
|
} else if ("or".equalsIgnoreCase(followInvoicePageListVo.getLogicJudge())) {
|
|
|
- Predicate<InsPlyIncomeDto> or = companyIdPredicate;
|
|
|
|
|
|
|
+ Predicate<InsPlyIncomeDto> or = partnerCompanyIdPredicate;
|
|
|
filterIncomes = incomes.stream().filter(or).toList();
|
|
filterIncomes = incomes.stream().filter(or).toList();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|