处理能源类型只有包含不包含 这个调整下 别的去掉的问题;增加不包含操作符处理逻辑

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/impl/RuleServiceImpl.java

@@ -198,10 +198,10 @@ public class RuleServiceImpl implements RuleService {
     }
 
     private boolean radioEqual(RuleAttrLinkVo linkVo, String value) {
-        //判断如果value 是 boolean值 则将min进行转换为bool
-        boolean minValue = Boolean.valueOf(linkVo.getMin());
-        boolean valueBool = Boolean.valueOf(value);
         if ("NewEnergyMark".equals(linkVo.getAttrCode())) {
+            //判断如果value 是 boolean值 则将min进行转换为bool
+            boolean minValue = Boolean.valueOf(linkVo.getMin());
+            boolean valueBool = Boolean.valueOf(value);
             if (linkVo.getMin().equals("5") || linkVo.getMin().equals("6")) {
                 minValue = linkVo.getMin().equals("5") ? false : true;
             }
@@ -211,7 +211,7 @@ public class RuleServiceImpl implements RuleService {
                 return !(minValue == valueBool);
             }
         }
-        return minValue == valueBool;
+        return linkVo.getOperator().equals(OperatorConstant.InputNumber.EQ.getCode()) ? linkVo.getMin().contains(value) : !linkVo.getMin().contains(value);
     }
 
     public boolean dateTimeEqual(RuleAttrLinkVo linkVo, String value){

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/FactorMatch.java

@@ -364,7 +364,7 @@ public class FactorMatch {
             boolean matched = EnergyTypeCode.isNewEnergy(value) == "1".equals(min);
             return "6".equals(rule.getOperator()) ? !matched : matched;
         }
-        return min.contains(value);
+        return "1".equals(rule.getOperator()) ? min.contains(value) : !min.contains(value);
     }
 
     private static boolean inputNumberEqual(PtlAgreementCostRule rule, String value) {