协议调度修改

src/main/java/com/ydtech/modules/protocol/service/impl/PtlTaxSourceServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.enums.InsuranceRisk;
+import com.ydtech.constants.enums.dict.insurance.EnergyType;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
 import com.ydtech.modules.base.controller.BaseController;
@@ -591,7 +592,7 @@ public class PtlTaxSourceServiceImpl extends ServiceImpl<PtlTaxSourceNewMapper,
         //8.第三者责任险
         String thirdPartyLiabilityInsurance =InsuranceRisk.getStringByB(kinds);
         //9.能源类型
-        String energyType = quoteInfo.getCarInfo().getEnergyType();
+        String energyType = EnergyType.isNewEnergy(quoteInfo.getCarInfo().getEnergyType()) ? "1" : "0";
         //报价信息
         msg = getString(msg, licenseNo,seats,exhaustScale,cimodelclassVal,vehicleUseVal,yqInsureFlag,cxInsureFlag,thirdPartyLiabilityInsurance);
         //通过调度id查询调度规则是否包含车牌、排量

src/main/java/com/ydtech/modules/scheme/service/impl/RuleFilteringServiceImpl.java

@@ -137,11 +137,16 @@ public class RuleFilteringServiceImpl implements RuleFilteringService {
         //将值进行分割
         String[] split = attrLink.getMin().split(",");
         AtomicBoolean returnBool = new AtomicBoolean(false);
-        Arrays.stream(split).forEach(x -> {
-            if (value.equals(x)) {
-                returnBool.set(true);
-            }
-        });
+
+        if(attrLink.getAttrCode().equals("BrandandModel") && attrLink.getOperator().equals("2")){
+            boolean anyMatch = Arrays.stream(split)
+                    .anyMatch(value::contains);
+            returnBool.set(!anyMatch);
+        }else {
+            boolean anyMatch = Arrays.stream(split)
+                    .anyMatch(value::contains);
+            returnBool.set(anyMatch);
+        }
         return returnBool.get();
     }