费用因子匹配失败不显示匹配值的问题处理;方案过滤能源类型校验因子匹配缺失转换问题处理

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

@@ -186,7 +186,11 @@ public class RuleServiceImpl implements RuleService {
             if (linkVo.getMin() != null) {
                 if (linkVo.getMin().equals("5") || linkVo.getMin().equals("6")) {
                     minValue = !linkVo.getMin().equals("5");
-                    valueBool = !value.equals("5");
+                    //valueBool = !value.equals("5");
+                }
+                if (linkVo.getMin().equals("1") || linkVo.getMin().equals("0")) {
+                    minValue = !linkVo.getMin().equals("0");
+                    //valueBool = !value.equals("1");
                 }
             }
             if (linkVo.getOperator().equals(OperatorConstant.InputNumber.EQ.getCode())) {

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

@@ -105,11 +105,11 @@ public class FactorMatch {
                                              StringBuilder logs) {
         for (PtlAgreementCostRule rule : batchRules) {
             String value = mappingIndex.get(rule.getAttrCode());
-            if (value == null) {
-                // 找不到传值属性时的日志
-                appendMissingAttrLog(logs, attrIndex, rule.getAttrCode(), false);
-                return false;
-            }
+            // if (value == null) {
+            //     // 找不到传值属性时的日志
+            //     appendMissingAttrLog(logs, attrIndex, rule.getAttrCode(), false);
+            //     return false;
+            // }
             // 协议费用因子元数据
             PtlAgreementUndwrtRulesAttr meta = attrIndex.get(rule.getAttrCode());
             boolean useFlag = attrEqual(rule, meta, value, false, dictIndex, dictNameIndex);