785834757 2 سال پیش
والد
کامیت
50004d19b2
1فایلهای تغییر یافته به همراه11 افزوده شده و 3 حذف شده
  1. 11 3
      src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

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

@@ -294,6 +294,10 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 insFeeOrderNew.setSecondDetailPremiums(new BigDecimal(0));
                 insFeeOrderNew.setThirdDetailPremiums(new BigDecimal(0));
             }
+        }else{
+            insFeeOrderNew.setFirstDetailProportion(new BigDecimal(0));
+            insFeeOrderNew.setSecondDetailProportion(new BigDecimal(0));
+            insFeeOrderNew.setThirdDetailProportion(new BigDecimal(0));
         }
 
 
@@ -815,14 +819,18 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      * @return
      */
     private boolean checkBoxEqual(PtlAgreementProductCostsAttrLink ptlAgreementProductCostsAttrLink, String value) {
-        if (ptlAgreementProductCostsAttrLink.getMin().equals(value)) {
-            return true;
+        String[] split = ptlAgreementProductCostsAttrLink.getMin().split(",");
+        for( String sp : split)
+        {
+            if(sp.equals(value)){
+                return true;
+            }
         }
         return false;
     }
 
     private boolean checkBoxEqual(PtlAgreementUndwrtRulesAttrLink ptlAgreementUndwrtRulesAttrLink, String value) {
-        if (!ptlAgreementUndwrtRulesAttrLink.getMin().equals(value)) {
+        if (!ptlAgreementUndwrtRulesAttrLink.getMin().contains(value)) {
             return true;
         }
         return false;