瀏覽代碼

修改select 不包含情况

785834757 1 年之前
父節點
當前提交
740f0899e9

+ 2 - 1
src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -91,7 +91,8 @@ public class RuleAttrMappingVo {
 
         // 中煤不浮动原因
         if(Objects.nonNull(quoteRespVo)) {
-            ruleAttrMappingVoList.add(new RuleAttrMappingVo("RateFloatFlag", ZmTransferType.getByCode(quoteRespVo.getRateFloatFlag())));
+            String rateFloatFlag = ZmTransferType.getByCode(quoteRespVo.getRateFloatFlag());
+            ruleAttrMappingVoList.add(new RuleAttrMappingVo("RateFloatFlag", rateFloatFlag == null ? "null" : rateFloatFlag));
         }
 
         boolean isNoLicenseFlag = false;

+ 4 - 4
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -3288,8 +3288,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             return true;
         }
         // 不包含的情况
-        if (ptlAgreementProductCostsAttrLink.getMin()!= null && ptlAgreementProductCostsAttrLink.getMin().contains(value) && ptlAgreementProductCostsAttrLink.getOperator().equals("1")) {
-            return false;
+        if (ptlAgreementProductCostsAttrLink.getMin()!= null && !ptlAgreementProductCostsAttrLink.getMin().contains(value) && ptlAgreementProductCostsAttrLink.getOperator().equals("1")) {
+            return true;
         }
         return false;
     }
@@ -3527,8 +3527,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     private PtlNewCarJudgeRules getCarJudgeRule(String companyId) {
         //获取车辆新旧车信息
         List<PtlNewCarJudgeRules> list =
-                ptlNewCarJudgeRulesService.list(new LambdaQueryWrapper<PtlNewCarJudgeRules>().eq(PtlNewCarJudgeRules::getCompanyId,
-                        companyId));
+                ptlNewCarJudgeRulesService.list(new LambdaQueryWrapper<PtlNewCarJudgeRules>()
+                        .eq(PtlNewCarJudgeRules::getCompanyId,companyId));
         if (list.size() > 0) {
             return list.get(0);
         }