|
@@ -3949,31 +3949,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
.collect(Collectors.toMap(FollowInvoicePageListVo.SearchVO::getName, Function.identity(), (oldItem, newItem) -> oldItem));
|
|
.collect(Collectors.toMap(FollowInvoicePageListVo.SearchVO::getName, Function.identity(), (oldItem, newItem) -> oldItem));
|
|
|
Set<String> names = searchVOMap.keySet();
|
|
Set<String> names = searchVOMap.keySet();
|
|
|
|
|
|
|
|
- // 保险公司
|
|
|
|
|
-// 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 -> {
|
|
Predicate<InsPlyIncomeDto> partnerCompanyIdPredicate = insPlyIncome -> {
|
|
|
if (!names.contains(FollowInvoicePageListVo.SearchVO.companyId)) {
|
|
if (!names.contains(FollowInvoicePageListVo.SearchVO.companyId)) {
|
|
|
return true;
|
|
return true;
|