Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

commons/src/main/java/com/jzg/commons/entity/finance/vo/IncomeDataVO.java

@@ -67,6 +67,7 @@ public class IncomeDataVO implements Serializable {
         public static final String licenseNo = "licenseNo";
         public static final String jqPolicyNo = "jqPolicyNo";
         public static final String syPolicyNo = "syPolicyNo";
+        public static final String jyPolicyNo = "jyPolicyNo";
         public static final String contactPerson = "contactPerson";
 
         /**

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -680,17 +680,41 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     }
                     return true;
                 };
+                // 驾意险保单号 jyPolicyNo
+                Predicate<InsPlyIncome> jyPolicyNoPredicate = insPlyIncome -> {
+                    if(!names.contains(IncomeDataVO.SearchVO.jyPolicyNo)){
+                        return true;
+                    }
+                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.jyPolicyNo);
+                    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> jyPolicyNos = Arrays.asList(search.split(","));
+                        return jyPolicyNos.contains(insPlyIncome.getJyPolicyNo());
+                    }
+                    if("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)){
+                        List<String> jyPolicyNos = Arrays.asList(search.split(","));
+                        return !jyPolicyNos.contains(insPlyIncome.getJyPolicyNo());
+                    }
+                    return true;
+                };
 
                 // add by lipf ，保险公司查询的时候，同时支持公司和子公司的查询 2026年7月29日10:30:05
                 if("and".equalsIgnoreCase(incomeDataVO.getLogicJudge())){
                     Predicate<InsPlyIncome> and = companyIdPredicate.or(companySubIdPredicate).and(signDatePredicate).
                             and(ptlAgreementPredicate).and(orderTypePredicate).and(signYearPredicate).and(licenseNoPredicate)
-                            .and(contactPredicate).and(jqPolicyNoPredicate).and(syPolicyNoPredicate);
+                            .and(contactPredicate).and(jqPolicyNoPredicate).and(syPolicyNoPredicate).and(jyPolicyNoPredicate);
                     filterIncomes = incomes.stream().filter(and).toList();
                 }else if ("or".equalsIgnoreCase(incomeDataVO.getLogicJudge())){
                     Predicate<InsPlyIncome> or = companyIdPredicate.or(companySubIdPredicate).or(signDatePredicate).
                             or(ptlAgreementPredicate).or(orderTypePredicate).or(signYearPredicate).or(licenseNoPredicate)
-                            .or(contactPredicate).or(jqPolicyNoPredicate).or(syPolicyNoPredicate);
+                            .or(contactPredicate).or(jqPolicyNoPredicate).or(syPolicyNoPredicate).or(jyPolicyNoPredicate);
                     filterIncomes = incomes.stream().filter(or).toList();
                 }
             }