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

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

@@ -596,7 +596,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             if(ruleAttrMappingVo == null) {
                 System.out.printf("规则匹配失败:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getAttrCode() + "\n");
                 System.out.printf("传入的值找不到该属性:" + ptlAgreementUndwrtRulesAttrLinks.get(finalI).getAttrCode() + "\n");
-                continue;
+                //找不到属性则直接跳过该条承保规则
+                return true;
             }
             //查找 费用因子规则
             PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementUndwrtRulesAttrLinks.get(finalI).getAttrCode())).findFirst().get();
@@ -617,14 +618,17 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 }
             }
             useFlag = attrEqual(ptlAgreementUndwrtRulesAttrLinks.get(i), ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
-            if(!useFlag)
-            {
-                System.out.printf("规则匹配失败:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getAttrCode() + "\n");
-                System.out.printf("检验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() + "\n");
-                System.out.printf("传入的值:" + ruleAttrMappingVo.getValue() + "\n");
-                return false;
-
+            if(useFlag){
+                return true;
             }
+//            if(!useFlag)
+//            {
+//                System.out.printf("规则匹配失败:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getAttrCode() + "\n");
+//                System.out.printf("检验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() + "\n");
+//                System.out.printf("传入的值:" + ruleAttrMappingVo.getValue() + "\n");
+//                return false;
+//
+//            }
         }
         return useFlag;
     }
@@ -855,10 +859,14 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      * @return
      */
     private boolean selectEqual(PtlAgreementUndwrtRulesAttrLink ptlAgreementUndwrtRulesAttrLink, String value){
-        if(ptlAgreementUndwrtRulesAttrLink.getMin() != null && ptlAgreementUndwrtRulesAttrLink.getMin().contains(value)){
+        if(ptlAgreementUndwrtRulesAttrLink.getMin() == null)
+        {
             return false;
         }
-        return true;
+        if(ptlAgreementUndwrtRulesAttrLink.getMin().contains(value)){
+            return true;
+        }
+        return false;
     }
 
     /**

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -162,7 +162,7 @@
             AND insuredname = #{params.insuredname}
         </if>
         <if test="params.startDateStr != null and params.startDateStr != ''">
-            AND createtime BETWEEN ${params.startDateStr} and ${params.endDateStr}
+            AND createtime BETWEEN #{params.startDateStr} and #{params.endDateStr}
         </if>
     </select>
 
@@ -194,8 +194,8 @@
         <if test="params.insuredname != null and params.insuredname != ''">
             AND insuredname = #{params.insuredname}
         </if>
-        <if test="params.startDate != null and params.startDate != ''">
-            BETWEEN createtime = #{params.startDate} and #{params.endDate}
+        <if test="params.startDateStr != null and params.startDateStr != ''">
+            AND createtime BETWEEN #{params.startDateStr} and #{params.endDateStr}
         </if>
     </select>
 </mapper>