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

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -12,6 +12,7 @@ import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -312,13 +313,14 @@ public class RuleAttrMappingVo {
 //        ruleAttrMappingVoList.add(new RuleAttrMappingVo("CommercialDiscount", String.valueOf(quoteRespVo.getSyAdjustRate())));
         //数值型总评分
         Pattern pattern = Pattern.compile("[0-9]*");
-        if(pattern.matcher(insAreaCompany.getScore()).matches())
-        {
-            //数值型评分
-            ruleAttrMappingVoList.add(new RuleAttrMappingVo("NumericalOverallRating", String.valueOf(insAreaCompany.getScore())));
-        }else{
-            //字母型评分
-            ruleAttrMappingVoList.add(new RuleAttrMappingVo("CharacterBasedRating", String.valueOf(insAreaCompany.getScore())));
+        if(insAreaCompany.getScore() != null) {
+            if (pattern.matcher(insAreaCompany.getScore()).matches()) {
+                //数值型评分
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("NumericalOverallRating", String.valueOf(insAreaCompany.getScore())));
+            } else {
+                //字母型评分
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("CharacterBasedRating", String.valueOf(insAreaCompany.getScore())));
+            }
         }
         //交强评分
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CompulsoryInsuranceRating", String.valueOf(insAreaCompany.getJqScore())));

src/main/java/com/ydtech/modules/fee/service/FeeRuleSchemeService.java

@@ -30,7 +30,7 @@ public interface FeeRuleSchemeService {
      */
     public QueryOrderFeeVo queryFeeOrderInfo(String companyId);
 
-    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo);
+//    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo);
 
     /**
      * 比较和更新总费用比例

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

@@ -28,6 +28,7 @@ import com.ydtech.modules.order.service.InsFeeOrderService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.entity.po.*;
 import com.ydtech.modules.protocol.service.*;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
@@ -1316,6 +1317,11 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         insFeeOrderService.insertCompanyAndOrders(insFeeOrder);
     }
 
+    @Override
+    public QueryOrderFeeVo queryFeeOrderInfo(String companyId) {
+        return null;
+    }
+
     public void compareAndUpdateFeeOrderInfo(String insOrderNo, String jqCostsProportionStr, String syCostsProportionStr, String dealUser) {
         InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insOrderNo);
         InsCopyFeeOrder insCopyFeeOrder = new InsCopyFeeOrder(insFeeOrder, insOrderNo, dealUser);
@@ -1370,78 +1376,79 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         return premium;
     }
 
-    public QueryOrderFeeVo queryFeeOrderInfo(String companyId) {
-        QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
-        QueryOrderCommissionVo orderCommissionVo = new QueryOrderCommissionVo();
-        OrderFeeVo jqOrderFeeVo = new OrderFeeVo();
-        OrderFeeVo syOrderFeeVo = new OrderFeeVo();
-        OrderFeeVo fcOrderFeeVo = new OrderFeeVo();
-        AdjustFeeDescVo adjustFeeDescVo = new AdjustFeeDescVo();//费用审核时使用
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
-        InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getId());
-
-        if (insFeeOrder != null) {
-            if (insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() > 0 && insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() == 0) {//当为单交业务时
-                jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
-                jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
-                jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
-                jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums()) + "元");
-                jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getJqCostsProportion()));
-                /*出单员手续费比例=总费用比例-各级管理费-各级分销费-溢出费*/
-                orderCommissionVo = getQueryOrderCommission(orderCommissionVo, insFeeOrder, "JQ");
-
-            } else if (insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() > 0 && insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() == 0) {//当为单商业务时
-                syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
-                syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
-                syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
-                syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums()) + "元");
-                syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getSyCostsProportion()));
-                /*出单员手续费比例=总费用比例-各级管理费-各级分销费-溢出费*/
-                orderCommissionVo = getQueryOrderCommission(orderCommissionVo, insFeeOrder, "SY");
-            } else if (insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() > 0 && insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() > 0) {//当为交商业务时
-                QueryOrderFeeVo queryOrderFeeVoTemp = packageOrderFeeInfoAll(insFeeOrder);
-                //获取交强险费用明细
-                jqOrderFeeVo = queryOrderFeeVoTemp.getJqCoderFeeVo();
-                jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
-                jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
-                jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums()) + "元");
-                jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getJqCostsProportion()));
-                //获取商业险费用明细
-                syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
-                syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
-                syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
-                syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums()) + "元");
-                syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getSyCostsProportion()));
-                /*出单员手续费比例=总费用比例-各级管理费-各级分销费-溢出费*/
-                orderCommissionVo = getQueryOrderCommission(orderCommissionVo, insFeeOrder, "ALL");
-            }
-            queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
-            queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
-            queryOrderFeeVo.setFcCoderFeeVo(fcOrderFeeVo);
-            queryOrderFeeVo.setOrderCommissionVo(orderCommissionVo);
-            //添加费用审核时 使用参数
-            if (insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() > 0) {
-                adjustFeeDescVo.setJqPremium(convertToString(insFeeOrder.getJqNoTaxPremium()));
-                adjustFeeDescVo.setJqCommissionRate(convertToString(insFeeOrder.getJqSuperviseCostsProportion()));
-                adjustFeeDescVo.setJqCommissionAmount(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()));
-                adjustFeeDescVo.setJqOtherFeeRate(convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())));
-                adjustFeeDescVo.setJqOtherFeeAmount(convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())));
-                adjustFeeDescVo.setJqAllFeeRate(convertToString(insFeeOrder.getJqCostsProportion()));
-                adjustFeeDescVo.setJqAllFeeAmount(convertToString(insFeeOrder.getJqCostsPremiums()));
-            }
-            if (insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() > 0) {
-                adjustFeeDescVo.setSyPremium(convertToString(insFeeOrder.getSyNoTaxPremium()));
-                adjustFeeDescVo.setSyCommissionRate(convertToString(insFeeOrder.getSySuperviseCostsProportion()));
-                adjustFeeDescVo.setSyCommissionAmount(convertToString(insFeeOrder.getSySuperviseCostsPremiums()));
-                adjustFeeDescVo.setSyOtherFeeRate(convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())));
-                adjustFeeDescVo.setSyOtherFeeAmount(convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())));
-                adjustFeeDescVo.setSyAllFeeRate(convertToString(insFeeOrder.getSyCostsProportion()));
-                adjustFeeDescVo.setSyAllFeeAmount(convertToString(insFeeOrder.getSyCostsPremiums()));
-            }
-            queryOrderFeeVo.setAdjustFeeDescVo(adjustFeeDescVo);
-        }
-        return queryOrderFeeVo;
-    }
+//    public QueryOrderFeeVo queryFeeOrderInfo(String companyId) {
+//        QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
+//        QueryOrderCommissionVo orderCommissionVo = new QueryOrderCommissionVo();
+//        OrderFeeVo jqOrderFeeVo = new OrderFeeVo();
+//        OrderFeeVo syOrderFeeVo = new OrderFeeVo();
+//        OrderFeeVo fcOrderFeeVo = new OrderFeeVo();
+//        AdjustFeeDescVo adjustFeeDescVo = new AdjustFeeDescVo();//费用审核时使用
+//        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
+//
+//        InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getId());
+//
+//        if (insFeeOrder != null) {
+//            if (insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() > 0 && insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() == 0) {//当为单交业务时
+//                jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
+//                jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
+//                jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+//                jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums()) + "元");
+//                jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getJqCostsProportion()));
+//                /*出单员手续费比例=总费用比例-各级管理费-各级分销费-溢出费*/
+//                orderCommissionVo = getQueryOrderCommission(orderCommissionVo, insFeeOrder, "JQ");
+//
+//            } else if (insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() > 0 && insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() == 0) {//当为单商业务时
+//                syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
+//                syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
+//                syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+//                syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums()) + "元");
+//                syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getSyCostsProportion()));
+//                /*出单员手续费比例=总费用比例-各级管理费-各级分销费-溢出费*/
+//                orderCommissionVo = getQueryOrderCommission(orderCommissionVo, insFeeOrder, "SY");
+//            } else if (insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() > 0 && insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() > 0) {//当为交商业务时
+//                QueryOrderFeeVo queryOrderFeeVoTemp = packageOrderFeeInfoAll(insFeeOrder);
+//                //获取交强险费用明细
+//                jqOrderFeeVo = queryOrderFeeVoTemp.getJqCoderFeeVo();
+//                jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
+//                jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+//                jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getJqCostsPremiums()) + "元");
+//                jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getJqCostsProportion()));
+//                //获取商业险费用明细
+//                syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
+//                syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
+//                syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+//                syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums()) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())) + "元 / " + convertToString(insFeeOrder.getSyCostsPremiums()) + "元");
+//                syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion()) + " / " + convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())) + " / " + convertToString(insFeeOrder.getSyCostsProportion()));
+//                /*出单员手续费比例=总费用比例-各级管理费-各级分销费-溢出费*/
+//                orderCommissionVo = getQueryOrderCommission(orderCommissionVo, insFeeOrder, "ALL");
+//            }
+//            queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
+//            queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
+//            queryOrderFeeVo.setFcCoderFeeVo(fcOrderFeeVo);
+//            queryOrderFeeVo.setOrderCommissionVo(orderCommissionVo);
+//            //添加费用审核时 使用参数
+//            if (insFeeOrder.getJqPremium() != null && insFeeOrder.getJqPremium().doubleValue() > 0) {
+//                adjustFeeDescVo.setJqPremium(convertToString(insFeeOrder.getJqNoTaxPremium()));
+//                adjustFeeDescVo.setJqCommissionRate(convertToString(insFeeOrder.getJqSuperviseCostsProportion()));
+//                adjustFeeDescVo.setJqCommissionAmount(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()));
+//                adjustFeeDescVo.setJqOtherFeeRate(convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())));
+//                adjustFeeDescVo.setJqOtherFeeAmount(convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())));
+//                adjustFeeDescVo.setJqAllFeeRate(convertToString(insFeeOrder.getJqCostsProportion()));
+//                adjustFeeDescVo.setJqAllFeeAmount(convertToString(insFeeOrder.getJqCostsPremiums()));
+//            }
+//            if (insFeeOrder.getSyPremium() != null && insFeeOrder.getSyPremium().doubleValue() > 0) {
+//                adjustFeeDescVo.setSyPremium(convertToString(insFeeOrder.getSyNoTaxPremium()));
+//                adjustFeeDescVo.setSyCommissionRate(convertToString(insFeeOrder.getSySuperviseCostsProportion()));
+//                adjustFeeDescVo.setSyCommissionAmount(convertToString(insFeeOrder.getSySuperviseCostsPremiums()));
+//                adjustFeeDescVo.setSyOtherFeeRate(convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())));
+//                adjustFeeDescVo.setSyOtherFeeAmount(convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())));
+//                adjustFeeDescVo.setSyAllFeeRate(convertToString(insFeeOrder.getSyCostsProportion()));
+//                adjustFeeDescVo.setSyAllFeeAmount(convertToString(insFeeOrder.getSyCostsPremiums()));
+//            }
+//            queryOrderFeeVo.setAdjustFeeDescVo(adjustFeeDescVo);
+//        }
+//        return queryOrderFeeVo;
+//    }
 
     private QueryOrderCommissionVo getQueryOrderCommission(QueryOrderCommissionVo orderCommissionVo, InsFeeOrder insFeeOrder,
      String businessType) {
@@ -1613,293 +1620,455 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         return totalCostsPremiums;
     }
 
-    //把取出的费用信息转换为页面需要展示的数据
-    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo) {
-        List<QueryOrderFeeResultVo> resultList = new ArrayList<>();
-        OrderFeeVo jqOrderFeeVo = orderFeeVo.getJqCoderFeeVo();
-        OrderFeeVo syOrderFeeVo = orderFeeVo.getSyCoderFeeVo();
-        OrderFeeVo fcOrderFeeVo = orderFeeVo.getFcCoderFeeVo();
-
-        //总费用
-        QueryOrderFeeResultVo feeResultVo1 = new QueryOrderFeeResultVo();
-        feeResultVo1.setDescSerialNo("1");
-        feeResultVo1.setFeeTypeName("总费用");
-        feeResultVo1.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getCostsProportion() != null ? jqOrderFeeVo.getCostsProportion() :
-         "-");
-        feeResultVo1.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getCostsPremiums() != null ? jqOrderFeeVo.getCostsPremiums() :
-        "-");
-        feeResultVo1.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getCostsProportion() != null ? syOrderFeeVo.getCostsProportion() :
-         "-");
-        feeResultVo1.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getCostsPremiums() != null ? syOrderFeeVo.getCostsPremiums() :
-        "-");
-        feeResultVo1.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getCostsProportion() != null ? fcOrderFeeVo.getCostsProportion() :
-         "-");
-        feeResultVo1.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getCostsPremiums() != null ? fcOrderFeeVo.getCostsPremiums() :
-        "-");
-        feeResultVo1.setJqFeeRateAll(jqOrderFeeVo != null && jqOrderFeeVo.getCostsProportionAll() != null ?
-         jqOrderFeeVo.getCostsProportionAll() : "-");
-        feeResultVo1.setJqFeeAmountAll(jqOrderFeeVo != null && jqOrderFeeVo.getCostsPremiumsAll() != null ?
-         jqOrderFeeVo.getCostsPremiumsAll() : "-");
-        feeResultVo1.setSyFeeRateAll(syOrderFeeVo != null && syOrderFeeVo.getCostsProportionAll() != null ?
-         syOrderFeeVo.getCostsProportionAll() : "-");
-        feeResultVo1.setSyFeeAmountAll(syOrderFeeVo != null && syOrderFeeVo.getCostsPremiumsAll() != null ?
-         syOrderFeeVo.getCostsPremiumsAll() : "-");
-        feeResultVo1.setFcFeeRateAll(fcOrderFeeVo != null && fcOrderFeeVo.getCostsProportionAll() != null ?
-         fcOrderFeeVo.getCostsProportionAll() : "-");
-        feeResultVo1.setFcFeeAmountAll(fcOrderFeeVo != null && fcOrderFeeVo.getCostsPremiumsAll() != null ?
-         fcOrderFeeVo.getCostsPremiumsAll() : "-");
-        resultList.add(feeResultVo1);
-        //一级管理费用
-        QueryOrderFeeResultVo feeResultVo2 = new QueryOrderFeeResultVo();
-        feeResultVo2.setDescSerialNo("2");
-        feeResultVo2.setFeeTypeName("一级管理费");
-        feeResultVo2.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getFirstDeptProportion() != null ?
-         jqOrderFeeVo.getFirstDeptProportion() : "-");
-        feeResultVo2.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getFirstDeptPremiums() != null ?
-         jqOrderFeeVo.getFirstDeptPremiums() : "-");
-        feeResultVo2.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getFirstDeptProportion() != null ?
-         syOrderFeeVo.getFirstDeptProportion() : "-");
-        feeResultVo2.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getFirstDeptPremiums() != null ?
-         syOrderFeeVo.getFirstDeptPremiums() : "-");
-        feeResultVo2.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getFirstDeptProportion() != null ?
-         fcOrderFeeVo.getFirstDeptProportion() : "-");
-        feeResultVo2.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getFirstDeptPremiums() != null ?
-         fcOrderFeeVo.getFirstDeptPremiums() : "-");
-        feeResultVo2.setJqFeeRateAll(feeResultVo2.getJqFeeRate());
-        feeResultVo2.setJqFeeAmountAll(feeResultVo2.getJqFeeAmount());
-        feeResultVo2.setSyFeeRateAll(feeResultVo2.getSyFeeRate());
-        feeResultVo2.setSyFeeAmountAll(feeResultVo2.getSyFeeAmount());
-        feeResultVo2.setFcFeeRateAll(feeResultVo2.getFcFeeRate());
-        feeResultVo2.setFcFeeAmountAll(feeResultVo2.getFcFeeAmount());
-        resultList.add(feeResultVo2);
-        //二级管理费用
-        QueryOrderFeeResultVo feeResultVo3 = new QueryOrderFeeResultVo();
-        feeResultVo3.setDescSerialNo("3");
-        feeResultVo3.setFeeTypeName("二级管理费");
-        feeResultVo3.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getSecondDeptProportion() != null ?
-         jqOrderFeeVo.getSecondDeptProportion() : "-");
-        feeResultVo3.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getSecondDeptPremiums() != null ?
-         jqOrderFeeVo.getSecondDeptPremiums() : "-");
-        feeResultVo3.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getSecondDeptProportion() != null ?
-         syOrderFeeVo.getSecondDeptProportion() : "-");
-        feeResultVo3.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getSecondDeptPremiums() != null ?
-         syOrderFeeVo.getSecondDeptPremiums() : "-");
-        feeResultVo3.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getSecondDeptProportion() != null ?
-         fcOrderFeeVo.getSecondDeptProportion() : "-");
-        feeResultVo3.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getSecondDeptPremiums() != null ?
-         fcOrderFeeVo.getSecondDeptPremiums() : "-");
-        feeResultVo3.setJqFeeRateAll(feeResultVo3.getJqFeeRate());
-        feeResultVo3.setJqFeeAmountAll(feeResultVo3.getJqFeeAmount());
-        feeResultVo3.setSyFeeRateAll(feeResultVo3.getSyFeeRate());
-        feeResultVo3.setSyFeeAmountAll(feeResultVo3.getSyFeeAmount());
-        feeResultVo3.setFcFeeRateAll(feeResultVo3.getFcFeeRate());
-        feeResultVo3.setFcFeeAmountAll(feeResultVo3.getFcFeeAmount());
-        resultList.add(feeResultVo3);
-        //三级管理费用
-        QueryOrderFeeResultVo feeResultVo4 = new QueryOrderFeeResultVo();
-        feeResultVo4.setDescSerialNo("4");
-        feeResultVo4.setFeeTypeName("三级管理费");
-        feeResultVo4.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getThirdDeptProportion() != null ?
-         jqOrderFeeVo.getThirdDeptProportion() : "-");
-        feeResultVo4.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getThirdDeptPremiums() != null ?
-         jqOrderFeeVo.getThirdDeptPremiums() : "-");
-        feeResultVo4.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getThirdDeptProportion() != null ?
-         syOrderFeeVo.getThirdDeptProportion() : "-");
-        feeResultVo4.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getThirdDeptPremiums() != null ?
-         syOrderFeeVo.getThirdDeptPremiums() : "-");
-        feeResultVo4.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getThirdDeptProportion() != null ?
-         fcOrderFeeVo.getThirdDeptProportion() : "-");
-        feeResultVo4.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getThirdDeptPremiums() != null ?
-         fcOrderFeeVo.getThirdDeptPremiums() : "-");
-        feeResultVo4.setJqFeeRateAll(feeResultVo4.getJqFeeRate());
-        feeResultVo4.setJqFeeAmountAll(feeResultVo4.getJqFeeAmount());
-        feeResultVo4.setSyFeeRateAll(feeResultVo4.getSyFeeRate());
-        feeResultVo4.setSyFeeAmountAll(feeResultVo4.getSyFeeAmount());
-        feeResultVo4.setFcFeeRateAll(feeResultVo4.getFcFeeRate());
-        feeResultVo4.setFcFeeAmountAll(feeResultVo4.getFcFeeAmount());
-        resultList.add(feeResultVo4);
-        //四级管理费用
-        QueryOrderFeeResultVo feeResultVo5 = new QueryOrderFeeResultVo();
-        feeResultVo5.setDescSerialNo("5");
-        feeResultVo5.setFeeTypeName("四级管理费");
-        feeResultVo5.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getForthDeptProportion() != null ?
-         jqOrderFeeVo.getForthDeptProportion() : "-");
-        feeResultVo5.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getForthDeptPremiums() != null ?
-         jqOrderFeeVo.getForthDeptPremiums() : "-");
-        feeResultVo5.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getForthDeptProportion() != null ?
-         syOrderFeeVo.getForthDeptProportion() : "-");
-        feeResultVo5.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getForthDeptPremiums() != null ?
-         syOrderFeeVo.getForthDeptPremiums() : "-");
-        feeResultVo5.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getForthDeptProportion() != null ?
-         fcOrderFeeVo.getForthDeptProportion() : "-");
-        feeResultVo5.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getForthDeptPremiums() != null ?
-         fcOrderFeeVo.getForthDeptPremiums() : "-");
-        feeResultVo5.setJqFeeRateAll(feeResultVo5.getJqFeeRate());
-        feeResultVo5.setJqFeeAmountAll(feeResultVo5.getJqFeeAmount());
-        feeResultVo5.setSyFeeRateAll(feeResultVo5.getSyFeeRate());
-        feeResultVo5.setSyFeeAmountAll(feeResultVo5.getSyFeeAmount());
-        feeResultVo5.setFcFeeRateAll(feeResultVo5.getFcFeeRate());
-        feeResultVo5.setFcFeeAmountAll(feeResultVo5.getFcFeeAmount());
-        resultList.add(feeResultVo5);
-        //五级管理费用
-        QueryOrderFeeResultVo feeResultVo6 = new QueryOrderFeeResultVo();
-        feeResultVo6.setDescSerialNo("6");
-        feeResultVo6.setFeeTypeName("五级管理费");
-        feeResultVo6.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getFifthDeptProportion() != null ?
-         jqOrderFeeVo.getFifthDeptProportion() : "-");
-        feeResultVo6.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getFifthDeptPremiums() != null ?
-         jqOrderFeeVo.getFifthDeptPremiums() : "-");
-        feeResultVo6.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getFifthDeptProportion() != null ?
-         syOrderFeeVo.getFifthDeptProportion() : "-");
-        feeResultVo6.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getFifthDeptPremiums() != null ?
-         syOrderFeeVo.getFifthDeptPremiums() : "-");
-        feeResultVo6.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getFifthDeptProportion() != null ?
-         fcOrderFeeVo.getFifthDeptProportion() : "-");
-        feeResultVo6.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getFifthDeptPremiums() != null ?
-         fcOrderFeeVo.getFifthDeptPremiums() : "-");
-        feeResultVo6.setJqFeeRateAll(feeResultVo6.getJqFeeRate());
-        feeResultVo6.setJqFeeAmountAll(feeResultVo6.getJqFeeAmount());
-        feeResultVo6.setSyFeeRateAll(feeResultVo6.getSyFeeRate());
-        feeResultVo6.setSyFeeAmountAll(feeResultVo6.getSyFeeAmount());
-        feeResultVo6.setFcFeeRateAll(feeResultVo6.getFcFeeRate());
-        feeResultVo6.setFcFeeAmountAll(feeResultVo6.getFcFeeAmount());
-        resultList.add(feeResultVo6);
-        //一级分销费
-        QueryOrderFeeResultVo feeResultVo7 = new QueryOrderFeeResultVo();
-        feeResultVo7.setDescSerialNo("7");
-        feeResultVo7.setFeeTypeName("一级分销费");
-        feeResultVo7.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getFirstRetailProportion() != null ?
-         jqOrderFeeVo.getFirstRetailProportion() : "-");
-        feeResultVo7.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getFirstRetailPremiums() != null ?
-         jqOrderFeeVo.getFirstRetailPremiums() : "-");
-        feeResultVo7.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getFirstRetailProportion() != null ?
-         syOrderFeeVo.getFirstRetailProportion() : "-");
-        feeResultVo7.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getFirstRetailPremiums() != null ?
-         syOrderFeeVo.getFirstRetailPremiums() : "-");
-        feeResultVo7.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getFirstRetailProportion() != null ?
-         fcOrderFeeVo.getFirstRetailProportion() : "-");
-        feeResultVo7.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getFirstRetailPremiums() != null ?
-         fcOrderFeeVo.getFirstRetailPremiums() : "-");
-        feeResultVo7.setJqFeeRateAll(feeResultVo7.getJqFeeRate());
-        feeResultVo7.setJqFeeAmountAll(feeResultVo7.getJqFeeAmount());
-        feeResultVo7.setSyFeeRateAll(feeResultVo7.getSyFeeRate());
-        feeResultVo7.setSyFeeAmountAll(feeResultVo7.getSyFeeAmount());
-        feeResultVo7.setFcFeeRateAll(feeResultVo7.getFcFeeRate());
-        feeResultVo7.setFcFeeAmountAll(feeResultVo7.getFcFeeAmount());
-        resultList.add(feeResultVo7);
-        //二级分销费
-        QueryOrderFeeResultVo feeResultVo8 = new QueryOrderFeeResultVo();
-        feeResultVo8.setDescSerialNo("8");
-        feeResultVo8.setFeeTypeName("二级分销费");
-        feeResultVo8.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getSecondRetailProportion() != null ?
-         jqOrderFeeVo.getSecondRetailProportion() : "-");
-        feeResultVo8.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getSecondRetailPremiums() != null ?
-         jqOrderFeeVo.getSecondRetailPremiums() : "-");
-        feeResultVo8.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getSecondRetailProportion() != null ?
-         syOrderFeeVo.getSecondRetailProportion() : "-");
-        feeResultVo8.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getSecondRetailPremiums() != null ?
-         syOrderFeeVo.getSecondRetailPremiums() : "-");
-        feeResultVo8.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getSecondRetailProportion() != null ?
-         fcOrderFeeVo.getSecondRetailProportion() : "-");
-        feeResultVo8.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getSecondRetailPremiums() != null ?
-         fcOrderFeeVo.getSecondRetailPremiums() : "-");
-        feeResultVo8.setJqFeeRateAll(feeResultVo8.getJqFeeRate());
-        feeResultVo8.setJqFeeAmountAll(feeResultVo8.getJqFeeAmount());
-        feeResultVo8.setSyFeeRateAll(feeResultVo8.getSyFeeRate());
-        feeResultVo8.setSyFeeAmountAll(feeResultVo8.getSyFeeAmount());
-        feeResultVo8.setFcFeeRateAll(feeResultVo8.getFcFeeRate());
-        feeResultVo8.setFcFeeAmountAll(feeResultVo8.getFcFeeAmount());
-        resultList.add(feeResultVo8);
-        //三级分销费
-        QueryOrderFeeResultVo feeResultVo9 = new QueryOrderFeeResultVo();
-        feeResultVo9.setDescSerialNo("9");
-        feeResultVo9.setFeeTypeName("三级分销费");
-        feeResultVo9.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getThirdRetailProportion() != null ?
-         jqOrderFeeVo.getThirdRetailProportion() : "-");
-        feeResultVo9.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getThirdRetailPremiums() != null ?
-         jqOrderFeeVo.getThirdRetailPremiums() : "-");
-        feeResultVo9.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getThirdRetailProportion() != null ?
-         syOrderFeeVo.getThirdRetailProportion() : "-");
-        feeResultVo9.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getThirdRetailPremiums() != null ?
-         syOrderFeeVo.getThirdRetailPremiums() : "-");
-        feeResultVo9.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getThirdRetailProportion() != null ?
-         fcOrderFeeVo.getThirdRetailProportion() : "-");
-        feeResultVo9.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getThirdRetailPremiums() != null ?
-         fcOrderFeeVo.getThirdRetailPremiums() : "-");
-        feeResultVo9.setJqFeeRateAll(feeResultVo9.getJqFeeRate());
-        feeResultVo9.setJqFeeAmountAll(feeResultVo9.getJqFeeAmount());
-        feeResultVo9.setSyFeeRateAll(feeResultVo9.getSyFeeRate());
-        feeResultVo9.setSyFeeAmountAll(feeResultVo9.getSyFeeAmount());
-        feeResultVo9.setFcFeeRateAll(feeResultVo9.getFcFeeRate());
-        feeResultVo9.setFcFeeAmountAll(feeResultVo9.getFcFeeAmount());
-        resultList.add(feeResultVo9);
-        return resultList;
+
+    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(InsFeeOrderNew insFeeOrderNew){
+        List<QueryOrderFeeResultVo> queryOrderFeeResultVos = new ArrayList<>();
+        QueryOrderFeeResultVo sumFeeResultVo = new QueryOrderFeeResultVo();
+        sumFeeResultVo.setDescSerialNo("1");
+        sumFeeResultVo.setFeeTypeName("总费用");
+        //设置交强费用比例
+        StringBuilder jqFeeRate = new StringBuilder();
+        jqFeeRate.append(insFeeOrderNew.getJqSuperviseCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getJqOtherCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getJqInvestmentCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getJqCostsProportion());
+        sumFeeResultVo.setJqFeeRateAll(jqFeeRate.toString());
+
+        //设置交强费用
+        StringBuilder jqFeePremium = new StringBuilder();
+        jqFeePremium.append(insFeeOrderNew.getJqSuperviseCostsPremiums()).append(" / ")
+                .append(insFeeOrderNew.getJqOtherCostsPremiums()).append(" / ")
+                .append(insFeeOrderNew.getJqInvestmentCostsPremiums()).append(" / ")
+                .append(insFeeOrderNew.getJqCostsPremiums());
+        sumFeeResultVo.setJqFeeAmountAll(jqFeePremium.toString());
+
+        //设置商业费用比例
+        StringBuilder syFeeRate = new StringBuilder();
+        syFeeRate.append(insFeeOrderNew.getSySuperviseCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getSyOtherCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getSyInvestmentCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getSyCostsProportion());
+        sumFeeResultVo.setSyFeeRateAll(syFeeRate.toString());
+
+        //设置商业费用
+        StringBuilder syFeePremium = new StringBuilder();
+        syFeePremium.append(insFeeOrderNew.getSySuperviseCostsPremiums()).append(" / ")
+            .append(insFeeOrderNew.getSyOtherCostsPremiums()).append(" / ")
+            .append(insFeeOrderNew.getSyInvestmentCostsPremiums()).append(" / ")
+            .append(insFeeOrderNew.getSyCostsPremiums());
+        sumFeeResultVo.setSyFeeAmountAll(syFeePremium.toString());
+
+        //设置非车费用比例
+        StringBuilder noFeeRate = new StringBuilder();
+        noFeeRate.append(insFeeOrderNew.getNoSuperviseCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getNoOtherCostsProportion()).append(" / ")
+                .append(insFeeOrderNew.getNoCostsProportion());
+        sumFeeResultVo.setFcFeeRateAll(noFeeRate.toString());
+
+        //设置非车费用
+        StringBuilder noFeePremium = new StringBuilder();
+        noFeePremium.append(insFeeOrderNew.getNoSuperviseCostsPremiums()).append(" / ")
+                .append(insFeeOrderNew.getNoOtherCostsPremiums()).append(" / ")
+                .append(insFeeOrderNew.getNoCostsPremiums());
+        sumFeeResultVo.setFcFeeAmountAll(noFeePremium.toString());
+
+        queryOrderFeeResultVos.add(sumFeeResultVo);
+
+        //设置一级管理费
+        QueryOrderFeeResultVo jqml1FeeResultVo = new QueryOrderFeeResultVo();
+        jqml1FeeResultVo.setDescSerialNo("2");
+        jqml1FeeResultVo.setFeeTypeName("一级管理费");
+        jqml1FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getJqDeptProportionLevel1().toString());
+        jqml1FeeResultVo.setJqFeeAmountAll(insFeeOrderNew.getJqDeptPremiumsLevel1().toString());
+        jqml1FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getSyDeptProportionLevel1().toString());
+        jqml1FeeResultVo.setSyFeeAmountAll(insFeeOrderNew.getSyDeptPremiumsLevel1().toString());
+        jqml1FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getNoDeptProportionLevel1().toString());
+        jqml1FeeResultVo.setFcFeeAmountAll(insFeeOrderNew.getNoDeptPremiumsLevel1().toString());
+        queryOrderFeeResultVos.add(jqml1FeeResultVo);
+
+        //设置二级管理费
+        QueryOrderFeeResultVo jqml2FeeResultVo = new QueryOrderFeeResultVo();
+        jqml2FeeResultVo.setDescSerialNo("3");
+        jqml2FeeResultVo.setFeeTypeName("二级管理费");
+        jqml2FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getJqDeptProportionLevel2().toString());
+        jqml2FeeResultVo.setJqFeeAmountAll(insFeeOrderNew.getJqDeptPremiumsLevel2().toString());
+        jqml2FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getSyDeptProportionLevel2().toString());
+        jqml2FeeResultVo.setSyFeeAmountAll(insFeeOrderNew.getSyDeptPremiumsLevel2().toString());
+        jqml2FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getNoDeptProportionLevel2().toString());
+        jqml2FeeResultVo.setFcFeeAmountAll(insFeeOrderNew.getNoDeptPremiumsLevel2().toString());
+        queryOrderFeeResultVos.add(jqml2FeeResultVo);
+
+        //设置三级管理费
+        QueryOrderFeeResultVo jqml3FeeResultVo = new QueryOrderFeeResultVo();
+        jqml3FeeResultVo.setDescSerialNo("4");
+        jqml3FeeResultVo.setFeeTypeName("三级管理费");
+        jqml3FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getJqDeptProportionLevel3().toString());
+        jqml3FeeResultVo.setJqFeeAmountAll(insFeeOrderNew.getJqDeptPremiumsLevel3().toString());
+        jqml3FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getSyDeptProportionLevel3().toString());
+        jqml3FeeResultVo.setSyFeeAmountAll(insFeeOrderNew.getSyDeptPremiumsLevel3().toString());
+        jqml3FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getNoDeptProportionLevel3().toString());
+        jqml3FeeResultVo.setFcFeeAmountAll(insFeeOrderNew.getNoDeptPremiumsLevel3().toString());
+        queryOrderFeeResultVos.add(jqml3FeeResultVo);
+
+        //设置四级管理费
+        QueryOrderFeeResultVo jqml4FeeResultVo = new QueryOrderFeeResultVo();
+        jqml4FeeResultVo.setDescSerialNo("5");
+        jqml4FeeResultVo.setFeeTypeName("四级管理费");
+        jqml4FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getJqDeptProportionLevel4().toString());
+        jqml4FeeResultVo.setJqFeeAmountAll(insFeeOrderNew.getJqDeptPremiumsLevel4().toString());
+        jqml4FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getSyDeptProportionLevel4().toString());
+        jqml4FeeResultVo.setSyFeeAmountAll(insFeeOrderNew.getSyDeptPremiumsLevel4().toString());
+        jqml4FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getNoDeptProportionLevel4().toString());
+        jqml4FeeResultVo.setFcFeeAmountAll(insFeeOrderNew.getNoDeptPremiumsLevel4().toString());
+        queryOrderFeeResultVos.add(jqml4FeeResultVo);
+
+        //设置五级管理费
+        QueryOrderFeeResultVo jqml5FeeResultVo = new QueryOrderFeeResultVo();
+        jqml5FeeResultVo.setDescSerialNo("6");
+        jqml5FeeResultVo.setFeeTypeName("五级管理费");
+        jqml5FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getJqDeptProportionLevel5().toString());
+        jqml5FeeResultVo.setJqFeeAmountAll(insFeeOrderNew.getJqDeptPremiumsLevel5().toString());
+        jqml5FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getSyDeptProportionLevel5().toString());
+        jqml5FeeResultVo.setSyFeeAmountAll(insFeeOrderNew.getSyDeptPremiumsLevel5().toString());
+        jqml5FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getNoDeptProportionLevel5().toString());
+        jqml5FeeResultVo.setFcFeeAmountAll(insFeeOrderNew.getNoDeptPremiumsLevel5().toString());
+        queryOrderFeeResultVos.add(jqml5FeeResultVo);
+
+        //设置一级分销费用
+        QueryOrderFeeResultVo detailLevel1FeeResultVo = new QueryOrderFeeResultVo();
+        detailLevel1FeeResultVo.setDescSerialNo("7");
+        detailLevel1FeeResultVo.setFeeTypeName("一级分销费");
+         detailLevel1FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getFirstDetailProportion().toString());
+        detailLevel1FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getFirstDetailProportion().toString());
+        detailLevel1FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getFirstDetailProportion().toString());
+        BigDecimal jqDetailFeePremium = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getFirstDetailProportion().divide(new BigDecimal("100")));
+        detailLevel1FeeResultVo.setJqFeeAmountAll(jqDetailFeePremium.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        BigDecimal syDetailFeePremium = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getFirstDetailProportion().divide(new BigDecimal("100")));
+        detailLevel1FeeResultVo.setSyFeeAmountAll(syDetailFeePremium.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        BigDecimal fcDetailFeePremium = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getFirstDetailProportion().divide(new BigDecimal("100")));
+        detailLevel1FeeResultVo.setFcFeeAmountAll(fcDetailFeePremium.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        queryOrderFeeResultVos.add(detailLevel1FeeResultVo);
+
+        //设置二级分销费用
+        QueryOrderFeeResultVo detailLevel2FeeResultVo = new QueryOrderFeeResultVo();
+        detailLevel2FeeResultVo.setDescSerialNo("8");
+        detailLevel2FeeResultVo.setFeeTypeName("二级分销费");
+        detailLevel2FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getSecondDetailProportion().toString());
+        detailLevel2FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getSecondDetailProportion().toString());
+        detailLevel2FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getSecondDetailProportion().toString());
+        BigDecimal jqDetailFeePremium2 = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getSecondDetailProportion().divide(new BigDecimal("100")));
+        detailLevel2FeeResultVo.setJqFeeAmountAll(jqDetailFeePremium2.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        BigDecimal syDetailFeePremium2 = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSecondDetailProportion().divide(new BigDecimal("100")));
+        detailLevel2FeeResultVo.setSyFeeAmountAll(syDetailFeePremium2.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        BigDecimal fcDetailFeePremium2 = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getSecondDetailProportion().divide(new BigDecimal("100")));
+        detailLevel2FeeResultVo.setFcFeeAmountAll(fcDetailFeePremium2.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        queryOrderFeeResultVos.add(detailLevel2FeeResultVo);
+
+        //设置三级分销费用
+        QueryOrderFeeResultVo detailLevel3FeeResultVo = new QueryOrderFeeResultVo();
+        detailLevel3FeeResultVo.setDescSerialNo("9");
+        detailLevel3FeeResultVo.setFeeTypeName("三级分销费");
+        detailLevel3FeeResultVo.setJqFeeRateAll(insFeeOrderNew.getThirdDetailProportion().toString());
+        detailLevel3FeeResultVo.setSyFeeRateAll(insFeeOrderNew.getThirdDetailProportion().toString());
+        detailLevel3FeeResultVo.setFcFeeRateAll(insFeeOrderNew.getThirdDetailProportion().toString());
+        BigDecimal jqDetailFeePremium3 = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getThirdDetailProportion().divide(new BigDecimal("100")));
+        detailLevel3FeeResultVo.setJqFeeAmountAll(jqDetailFeePremium3.setScale(2, BigDecimal.ROUND_DOWN).toString());
+        BigDecimal syDetailFeePremium3 = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getThirdDetailProportion().divide(new BigDecimal("100")));
+        detailLevel3FeeResultVo.setSyFeeAmountAll(syDetailFeePremium3.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        BigDecimal fcDetailFeePremium3 = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getThirdDetailProportion().divide(new BigDecimal("100")));
+        detailLevel3FeeResultVo.setFcFeeAmountAll(fcDetailFeePremium3.setScale(2,BigDecimal.ROUND_DOWN).toString());
+        queryOrderFeeResultVos.add(detailLevel3FeeResultVo);
+
+        return queryOrderFeeResultVos;
     }
 
+    //把取出的费用信息转换为页面需要展示的数据
+//    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo) {
+//        List<QueryOrderFeeResultVo> resultList = new ArrayList<>();
+//        OrderFeeVo jqOrderFeeVo = orderFeeVo.getJqCoderFeeVo();
+//        OrderFeeVo syOrderFeeVo = orderFeeVo.getSyCoderFeeVo();
+//        OrderFeeVo fcOrderFeeVo = orderFeeVo.getFcCoderFeeVo();
+//
+//        //总费用
+//        QueryOrderFeeResultVo feeResultVo1 = new QueryOrderFeeResultVo();
+//        feeResultVo1.setDescSerialNo("1");
+//        feeResultVo1.setFeeTypeName("总费用");
+//        feeResultVo1.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getCostsProportion() != null ? jqOrderFeeVo.getCostsProportion() :
+//         "-");
+//        feeResultVo1.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getCostsPremiums() != null ? jqOrderFeeVo.getCostsPremiums() :
+//        "-");
+//        feeResultVo1.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getCostsProportion() != null ? syOrderFeeVo.getCostsProportion() :
+//         "-");
+//        feeResultVo1.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getCostsPremiums() != null ? syOrderFeeVo.getCostsPremiums() :
+//        "-");
+//        feeResultVo1.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getCostsProportion() != null ? fcOrderFeeVo.getCostsProportion() :
+//         "-");
+//        feeResultVo1.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getCostsPremiums() != null ? fcOrderFeeVo.getCostsPremiums() :
+//        "-");
+//        feeResultVo1.setJqFeeRateAll(jqOrderFeeVo != null && jqOrderFeeVo.getCostsProportionAll() != null ?
+//         jqOrderFeeVo.getCostsProportionAll() : "-");
+//        feeResultVo1.setJqFeeAmountAll(jqOrderFeeVo != null && jqOrderFeeVo.getCostsPremiumsAll() != null ?
+//         jqOrderFeeVo.getCostsPremiumsAll() : "-");
+//        feeResultVo1.setSyFeeRateAll(syOrderFeeVo != null && syOrderFeeVo.getCostsProportionAll() != null ?
+//         syOrderFeeVo.getCostsProportionAll() : "-");
+//        feeResultVo1.setSyFeeAmountAll(syOrderFeeVo != null && syOrderFeeVo.getCostsPremiumsAll() != null ?
+//         syOrderFeeVo.getCostsPremiumsAll() : "-");
+//        feeResultVo1.setFcFeeRateAll(fcOrderFeeVo != null && fcOrderFeeVo.getCostsProportionAll() != null ?
+//         fcOrderFeeVo.getCostsProportionAll() : "-");
+//        feeResultVo1.setFcFeeAmountAll(fcOrderFeeVo != null && fcOrderFeeVo.getCostsPremiumsAll() != null ?
+//         fcOrderFeeVo.getCostsPremiumsAll() : "-");
+//        resultList.add(feeResultVo1);
+//        //一级管理费用
+//        QueryOrderFeeResultVo feeResultVo2 = new QueryOrderFeeResultVo();
+//        feeResultVo2.setDescSerialNo("2");
+//        feeResultVo2.setFeeTypeName("一级管理费");
+//        feeResultVo2.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getFirstDeptProportion() != null ?
+//         jqOrderFeeVo.getFirstDeptProportion() : "-");
+//        feeResultVo2.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getFirstDeptPremiums() != null ?
+//         jqOrderFeeVo.getFirstDeptPremiums() : "-");
+//        feeResultVo2.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getFirstDeptProportion() != null ?
+//         syOrderFeeVo.getFirstDeptProportion() : "-");
+//        feeResultVo2.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getFirstDeptPremiums() != null ?
+//         syOrderFeeVo.getFirstDeptPremiums() : "-");
+//        feeResultVo2.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getFirstDeptProportion() != null ?
+//         fcOrderFeeVo.getFirstDeptProportion() : "-");
+//        feeResultVo2.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getFirstDeptPremiums() != null ?
+//         fcOrderFeeVo.getFirstDeptPremiums() : "-");
+//        feeResultVo2.setJqFeeRateAll(feeResultVo2.getJqFeeRate());
+//        feeResultVo2.setJqFeeAmountAll(feeResultVo2.getJqFeeAmount());
+//        feeResultVo2.setSyFeeRateAll(feeResultVo2.getSyFeeRate());
+//        feeResultVo2.setSyFeeAmountAll(feeResultVo2.getSyFeeAmount());
+//        feeResultVo2.setFcFeeRateAll(feeResultVo2.getFcFeeRate());
+//        feeResultVo2.setFcFeeAmountAll(feeResultVo2.getFcFeeAmount());
+//        resultList.add(feeResultVo2);
+//        //二级管理费用
+//        QueryOrderFeeResultVo feeResultVo3 = new QueryOrderFeeResultVo();
+//        feeResultVo3.setDescSerialNo("3");
+//        feeResultVo3.setFeeTypeName("二级管理费");
+//        feeResultVo3.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getSecondDeptProportion() != null ?
+//         jqOrderFeeVo.getSecondDeptProportion() : "-");
+//        feeResultVo3.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getSecondDeptPremiums() != null ?
+//         jqOrderFeeVo.getSecondDeptPremiums() : "-");
+//        feeResultVo3.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getSecondDeptProportion() != null ?
+//         syOrderFeeVo.getSecondDeptProportion() : "-");
+//        feeResultVo3.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getSecondDeptPremiums() != null ?
+//         syOrderFeeVo.getSecondDeptPremiums() : "-");
+//        feeResultVo3.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getSecondDeptProportion() != null ?
+//         fcOrderFeeVo.getSecondDeptProportion() : "-");
+//        feeResultVo3.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getSecondDeptPremiums() != null ?
+//         fcOrderFeeVo.getSecondDeptPremiums() : "-");
+//        feeResultVo3.setJqFeeRateAll(feeResultVo3.getJqFeeRate());
+//        feeResultVo3.setJqFeeAmountAll(feeResultVo3.getJqFeeAmount());
+//        feeResultVo3.setSyFeeRateAll(feeResultVo3.getSyFeeRate());
+//        feeResultVo3.setSyFeeAmountAll(feeResultVo3.getSyFeeAmount());
+//        feeResultVo3.setFcFeeRateAll(feeResultVo3.getFcFeeRate());
+//        feeResultVo3.setFcFeeAmountAll(feeResultVo3.getFcFeeAmount());
+//        resultList.add(feeResultVo3);
+//        //三级管理费用
+//        QueryOrderFeeResultVo feeResultVo4 = new QueryOrderFeeResultVo();
+//        feeResultVo4.setDescSerialNo("4");
+//        feeResultVo4.setFeeTypeName("三级管理费");
+//        feeResultVo4.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getThirdDeptProportion() != null ?
+//         jqOrderFeeVo.getThirdDeptProportion() : "-");
+//        feeResultVo4.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getThirdDeptPremiums() != null ?
+//         jqOrderFeeVo.getThirdDeptPremiums() : "-");
+//        feeResultVo4.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getThirdDeptProportion() != null ?
+//         syOrderFeeVo.getThirdDeptProportion() : "-");
+//        feeResultVo4.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getThirdDeptPremiums() != null ?
+//         syOrderFeeVo.getThirdDeptPremiums() : "-");
+//        feeResultVo4.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getThirdDeptProportion() != null ?
+//         fcOrderFeeVo.getThirdDeptProportion() : "-");
+//        feeResultVo4.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getThirdDeptPremiums() != null ?
+//         fcOrderFeeVo.getThirdDeptPremiums() : "-");
+//        feeResultVo4.setJqFeeRateAll(feeResultVo4.getJqFeeRate());
+//        feeResultVo4.setJqFeeAmountAll(feeResultVo4.getJqFeeAmount());
+//        feeResultVo4.setSyFeeRateAll(feeResultVo4.getSyFeeRate());
+//        feeResultVo4.setSyFeeAmountAll(feeResultVo4.getSyFeeAmount());
+//        feeResultVo4.setFcFeeRateAll(feeResultVo4.getFcFeeRate());
+//        feeResultVo4.setFcFeeAmountAll(feeResultVo4.getFcFeeAmount());
+//        resultList.add(feeResultVo4);
+//        //四级管理费用
+//        QueryOrderFeeResultVo feeResultVo5 = new QueryOrderFeeResultVo();
+//        feeResultVo5.setDescSerialNo("5");
+//        feeResultVo5.setFeeTypeName("四级管理费");
+//        feeResultVo5.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getForthDeptProportion() != null ?
+//         jqOrderFeeVo.getForthDeptProportion() : "-");
+//        feeResultVo5.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getForthDeptPremiums() != null ?
+//         jqOrderFeeVo.getForthDeptPremiums() : "-");
+//        feeResultVo5.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getForthDeptProportion() != null ?
+//         syOrderFeeVo.getForthDeptProportion() : "-");
+//        feeResultVo5.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getForthDeptPremiums() != null ?
+//         syOrderFeeVo.getForthDeptPremiums() : "-");
+//        feeResultVo5.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getForthDeptProportion() != null ?
+//         fcOrderFeeVo.getForthDeptProportion() : "-");
+//        feeResultVo5.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getForthDeptPremiums() != null ?
+//         fcOrderFeeVo.getForthDeptPremiums() : "-");
+//        feeResultVo5.setJqFeeRateAll(feeResultVo5.getJqFeeRate());
+//        feeResultVo5.setJqFeeAmountAll(feeResultVo5.getJqFeeAmount());
+//        feeResultVo5.setSyFeeRateAll(feeResultVo5.getSyFeeRate());
+//        feeResultVo5.setSyFeeAmountAll(feeResultVo5.getSyFeeAmount());
+//        feeResultVo5.setFcFeeRateAll(feeResultVo5.getFcFeeRate());
+//        feeResultVo5.setFcFeeAmountAll(feeResultVo5.getFcFeeAmount());
+//        resultList.add(feeResultVo5);
+//        //五级管理费用
+//        QueryOrderFeeResultVo feeResultVo6 = new QueryOrderFeeResultVo();
+//        feeResultVo6.setDescSerialNo("6");
+//        feeResultVo6.setFeeTypeName("五级管理费");
+//        feeResultVo6.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getFifthDeptProportion() != null ?
+//         jqOrderFeeVo.getFifthDeptProportion() : "-");
+//        feeResultVo6.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getFifthDeptPremiums() != null ?
+//         jqOrderFeeVo.getFifthDeptPremiums() : "-");
+//        feeResultVo6.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getFifthDeptProportion() != null ?
+//         syOrderFeeVo.getFifthDeptProportion() : "-");
+//        feeResultVo6.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getFifthDeptPremiums() != null ?
+//         syOrderFeeVo.getFifthDeptPremiums() : "-");
+//        feeResultVo6.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getFifthDeptProportion() != null ?
+//         fcOrderFeeVo.getFifthDeptProportion() : "-");
+//        feeResultVo6.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getFifthDeptPremiums() != null ?
+//         fcOrderFeeVo.getFifthDeptPremiums() : "-");
+//        feeResultVo6.setJqFeeRateAll(feeResultVo6.getJqFeeRate());
+//        feeResultVo6.setJqFeeAmountAll(feeResultVo6.getJqFeeAmount());
+//        feeResultVo6.setSyFeeRateAll(feeResultVo6.getSyFeeRate());
+//        feeResultVo6.setSyFeeAmountAll(feeResultVo6.getSyFeeAmount());
+//        feeResultVo6.setFcFeeRateAll(feeResultVo6.getFcFeeRate());
+//        feeResultVo6.setFcFeeAmountAll(feeResultVo6.getFcFeeAmount());
+//        resultList.add(feeResultVo6);
+//        //一级分销费
+//        QueryOrderFeeResultVo feeResultVo7 = new QueryOrderFeeResultVo();
+//        feeResultVo7.setDescSerialNo("7");
+//        feeResultVo7.setFeeTypeName("一级分销费");
+//        feeResultVo7.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getFirstRetailProportion() != null ?
+//         jqOrderFeeVo.getFirstRetailProportion() : "-");
+//        feeResultVo7.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getFirstRetailPremiums() != null ?
+//         jqOrderFeeVo.getFirstRetailPremiums() : "-");
+//        feeResultVo7.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getFirstRetailProportion() != null ?
+//         syOrderFeeVo.getFirstRetailProportion() : "-");
+//        feeResultVo7.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getFirstRetailPremiums() != null ?
+//         syOrderFeeVo.getFirstRetailPremiums() : "-");
+//        feeResultVo7.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getFirstRetailProportion() != null ?
+//         fcOrderFeeVo.getFirstRetailProportion() : "-");
+//        feeResultVo7.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getFirstRetailPremiums() != null ?
+//         fcOrderFeeVo.getFirstRetailPremiums() : "-");
+//        feeResultVo7.setJqFeeRateAll(feeResultVo7.getJqFeeRate());
+//        feeResultVo7.setJqFeeAmountAll(feeResultVo7.getJqFeeAmount());
+//        feeResultVo7.setSyFeeRateAll(feeResultVo7.getSyFeeRate());
+//        feeResultVo7.setSyFeeAmountAll(feeResultVo7.getSyFeeAmount());
+//        feeResultVo7.setFcFeeRateAll(feeResultVo7.getFcFeeRate());
+//        feeResultVo7.setFcFeeAmountAll(feeResultVo7.getFcFeeAmount());
+//        resultList.add(feeResultVo7);
+//        //二级分销费
+//        QueryOrderFeeResultVo feeResultVo8 = new QueryOrderFeeResultVo();
+//        feeResultVo8.setDescSerialNo("8");
+//        feeResultVo8.setFeeTypeName("二级分销费");
+//        feeResultVo8.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getSecondRetailProportion() != null ?
+//         jqOrderFeeVo.getSecondRetailProportion() : "-");
+//        feeResultVo8.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getSecondRetailPremiums() != null ?
+//         jqOrderFeeVo.getSecondRetailPremiums() : "-");
+//        feeResultVo8.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getSecondRetailProportion() != null ?
+//         syOrderFeeVo.getSecondRetailProportion() : "-");
+//        feeResultVo8.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getSecondRetailPremiums() != null ?
+//         syOrderFeeVo.getSecondRetailPremiums() : "-");
+//        feeResultVo8.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getSecondRetailProportion() != null ?
+//         fcOrderFeeVo.getSecondRetailProportion() : "-");
+//        feeResultVo8.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getSecondRetailPremiums() != null ?
+//         fcOrderFeeVo.getSecondRetailPremiums() : "-");
+//        feeResultVo8.setJqFeeRateAll(feeResultVo8.getJqFeeRate());
+//        feeResultVo8.setJqFeeAmountAll(feeResultVo8.getJqFeeAmount());
+//        feeResultVo8.setSyFeeRateAll(feeResultVo8.getSyFeeRate());
+//        feeResultVo8.setSyFeeAmountAll(feeResultVo8.getSyFeeAmount());
+//        feeResultVo8.setFcFeeRateAll(feeResultVo8.getFcFeeRate());
+//        feeResultVo8.setFcFeeAmountAll(feeResultVo8.getFcFeeAmount());
+//        resultList.add(feeResultVo8);
+//        //三级分销费
+//        QueryOrderFeeResultVo feeResultVo9 = new QueryOrderFeeResultVo();
+//        feeResultVo9.setDescSerialNo("9");
+//        feeResultVo9.setFeeTypeName("三级分销费");
+//        feeResultVo9.setJqFeeRate(jqOrderFeeVo != null && jqOrderFeeVo.getThirdRetailProportion() != null ?
+//         jqOrderFeeVo.getThirdRetailProportion() : "-");
+//        feeResultVo9.setJqFeeAmount(jqOrderFeeVo != null && jqOrderFeeVo.getThirdRetailPremiums() != null ?
+//         jqOrderFeeVo.getThirdRetailPremiums() : "-");
+//        feeResultVo9.setSyFeeRate(syOrderFeeVo != null && syOrderFeeVo.getThirdRetailProportion() != null ?
+//         syOrderFeeVo.getThirdRetailProportion() : "-");
+//        feeResultVo9.setSyFeeAmount(syOrderFeeVo != null && syOrderFeeVo.getThirdRetailPremiums() != null ?
+//         syOrderFeeVo.getThirdRetailPremiums() : "-");
+//        feeResultVo9.setFcFeeRate(fcOrderFeeVo != null && fcOrderFeeVo.getThirdRetailProportion() != null ?
+//         fcOrderFeeVo.getThirdRetailProportion() : "-");
+//        feeResultVo9.setFcFeeAmount(fcOrderFeeVo != null && fcOrderFeeVo.getThirdRetailPremiums() != null ?
+//         fcOrderFeeVo.getThirdRetailPremiums() : "-");
+//        feeResultVo9.setJqFeeRateAll(feeResultVo9.getJqFeeRate());
+//        feeResultVo9.setJqFeeAmountAll(feeResultVo9.getJqFeeAmount());
+//        feeResultVo9.setSyFeeRateAll(feeResultVo9.getSyFeeRate());
+//        feeResultVo9.setSyFeeAmountAll(feeResultVo9.getSyFeeAmount());
+//        feeResultVo9.setFcFeeRateAll(feeResultVo9.getFcFeeRate());
+//        feeResultVo9.setFcFeeAmountAll(feeResultVo9.getFcFeeAmount());
+//        resultList.add(feeResultVo9);
+//        return resultList;
+//    }
+
     /**
      * 按照组合单模式获取费用明细
      *
      * @param insFeeOrder
      * @return
      */
-    private QueryOrderFeeVo packageOrderFeeInfoAll(InsFeeOrder insFeeOrder) {
-        QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
-        InsFeeOrder jqInsFeeOrderTemp = new InsFeeOrder();
-        //先利用交强费重算费用
-        jqInsFeeOrderTemp.setFirstDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getFirstDeptProportion()));
-        jqInsFeeOrderTemp.setSecondDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getSecondDeptProportion()));
-        jqInsFeeOrderTemp.setThirdDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getThirdDeptProportion()));
-        jqInsFeeOrderTemp.setForthDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getForthDeptProportion()));
-        jqInsFeeOrderTemp.setFifthDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getFifthDeptProportion()));
-        jqInsFeeOrderTemp.setFirstRetailPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getFirstRetailProportion()));
-        jqInsFeeOrderTemp.setSecondRetailPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getSecondRetailProportion()));
-        jqInsFeeOrderTemp.setThirdRetailPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getThirdRetailProportion()));
-
-        //再利用总费-交强费，得出商业费
-        InsFeeOrder syInsFeeOrderTemp = new InsFeeOrder();
-        syInsFeeOrderTemp.setFirstDeptPremiums(getPremiumForSubtract(insFeeOrder.getFirstDeptPremiums(),
-         jqInsFeeOrderTemp.getFirstDeptPremiums()));
-        syInsFeeOrderTemp.setSecondDeptPremiums(getPremiumForSubtract(insFeeOrder.getSecondDeptPremiums(),
-         jqInsFeeOrderTemp.getSecondDeptPremiums()));
-        syInsFeeOrderTemp.setThirdDeptPremiums(getPremiumForSubtract(insFeeOrder.getThirdDeptPremiums(),
-         jqInsFeeOrderTemp.getThirdDeptPremiums()));
-        syInsFeeOrderTemp.setForthDeptPremiums(getPremiumForSubtract(insFeeOrder.getForthDeptPremiums(),
-         jqInsFeeOrderTemp.getForthDeptPremiums()));
-        syInsFeeOrderTemp.setFifthDeptPremiums(getPremiumForSubtract(insFeeOrder.getFifthDeptPremiums(),
-         jqInsFeeOrderTemp.getFifthDeptPremiums()));
-        syInsFeeOrderTemp.setFirstRetailPremiums(getPremiumForSubtract(insFeeOrder.getFirstRetailPremiums(),
-         jqInsFeeOrderTemp.getFirstRetailPremiums()));
-        syInsFeeOrderTemp.setSecondRetailPremiums(getPremiumForSubtract(insFeeOrder.getSecondRetailPremiums(),
-         jqInsFeeOrderTemp.getSecondRetailPremiums()));
-        syInsFeeOrderTemp.setThirdRetailPremiums(getPremiumForSubtract(insFeeOrder.getThirdRetailPremiums(),
-         jqInsFeeOrderTemp.getThirdRetailPremiums()));
-
-        //交强费转换赋值
-        OrderFeeVo jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
-        jqOrderFeeVo.setFirstDeptPremiums(convertToString(jqInsFeeOrderTemp.getFirstDeptPremiums()));
-        jqOrderFeeVo.setSecondDeptPremiums(convertToString(jqInsFeeOrderTemp.getSecondDeptPremiums()));
-        jqOrderFeeVo.setThirdDeptPremiums(convertToString(jqInsFeeOrderTemp.getThirdDeptPremiums()));
-        jqOrderFeeVo.setForthDeptPremiums(convertToString(jqInsFeeOrderTemp.getForthDeptPremiums()));
-        jqOrderFeeVo.setFifthDeptPremiums(convertToString(jqInsFeeOrderTemp.getFifthDeptPremiums()));
-        jqOrderFeeVo.setFirstRetailPremiums(convertToString(jqInsFeeOrderTemp.getFirstRetailPremiums()));
-        jqOrderFeeVo.setSecondRetailPremiums(convertToString(jqInsFeeOrderTemp.getSecondRetailPremiums()));
-        jqOrderFeeVo.setThirdRetailPremiums(convertToString(jqInsFeeOrderTemp.getThirdRetailPremiums()));
-
-        //商业费转换赋值
-        OrderFeeVo syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
-        syOrderFeeVo.setFirstDeptPremiums(convertToString(syInsFeeOrderTemp.getFirstDeptPremiums()));
-        syOrderFeeVo.setSecondDeptPremiums(convertToString(syInsFeeOrderTemp.getSecondDeptPremiums()));
-        syOrderFeeVo.setThirdDeptPremiums(convertToString(syInsFeeOrderTemp.getThirdDeptPremiums()));
-        syOrderFeeVo.setForthDeptPremiums(convertToString(syInsFeeOrderTemp.getForthDeptPremiums()));
-        syOrderFeeVo.setFifthDeptPremiums(convertToString(syInsFeeOrderTemp.getFifthDeptPremiums()));
-        syOrderFeeVo.setFirstRetailPremiums(convertToString(syInsFeeOrderTemp.getFirstRetailPremiums()));
-        syOrderFeeVo.setSecondRetailPremiums(convertToString(syInsFeeOrderTemp.getSecondRetailPremiums()));
-        syOrderFeeVo.setThirdRetailPremiums(convertToString(syInsFeeOrderTemp.getThirdRetailPremiums()));
-
-        queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
-        queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
-        return queryOrderFeeVo;
-    }
+//    private QueryOrderFeeVo packageOrderFeeInfoAll(InsFeeOrder insFeeOrder) {
+//        QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
+//        InsFeeOrder jqInsFeeOrderTemp = new InsFeeOrder();
+//        //先利用交强费重算费用
+//        jqInsFeeOrderTemp.setFirstDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getFirstDeptProportion()));
+//        jqInsFeeOrderTemp.setSecondDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getSecondDeptProportion()));
+//        jqInsFeeOrderTemp.setThirdDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getThirdDeptProportion()));
+//        jqInsFeeOrderTemp.setForthDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getForthDeptProportion()));
+//        jqInsFeeOrderTemp.setFifthDeptPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getFifthDeptProportion()));
+//        jqInsFeeOrderTemp.setFirstRetailPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getFirstRetailProportion()));
+//        jqInsFeeOrderTemp.setSecondRetailPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getSecondRetailProportion()));
+//        jqInsFeeOrderTemp.setThirdRetailPremiums(getPremium(insFeeOrder.getJqNoTaxPremium(), insFeeOrder.getThirdRetailProportion()));
+//
+//        //再利用总费-交强费，得出商业费
+//        InsFeeOrder syInsFeeOrderTemp = new InsFeeOrder();
+//        syInsFeeOrderTemp.setFirstDeptPremiums(getPremiumForSubtract(insFeeOrder.getFirstDeptPremiums(),
+//         jqInsFeeOrderTemp.getFirstDeptPremiums()));
+//        syInsFeeOrderTemp.setSecondDeptPremiums(getPremiumForSubtract(insFeeOrder.getSecondDeptPremiums(),
+//         jqInsFeeOrderTemp.getSecondDeptPremiums()));
+//        syInsFeeOrderTemp.setThirdDeptPremiums(getPremiumForSubtract(insFeeOrder.getThirdDeptPremiums(),
+//         jqInsFeeOrderTemp.getThirdDeptPremiums()));
+//        syInsFeeOrderTemp.setForthDeptPremiums(getPremiumForSubtract(insFeeOrder.getForthDeptPremiums(),
+//         jqInsFeeOrderTemp.getForthDeptPremiums()));
+//        syInsFeeOrderTemp.setFifthDeptPremiums(getPremiumForSubtract(insFeeOrder.getFifthDeptPremiums(),
+//         jqInsFeeOrderTemp.getFifthDeptPremiums()));
+//        syInsFeeOrderTemp.setFirstRetailPremiums(getPremiumForSubtract(insFeeOrder.getFirstRetailPremiums(),
+//         jqInsFeeOrderTemp.getFirstRetailPremiums()));
+//        syInsFeeOrderTemp.setSecondRetailPremiums(getPremiumForSubtract(insFeeOrder.getSecondRetailPremiums(),
+//         jqInsFeeOrderTemp.getSecondRetailPremiums()));
+//        syInsFeeOrderTemp.setThirdRetailPremiums(getPremiumForSubtract(insFeeOrder.getThirdRetailPremiums(),
+//         jqInsFeeOrderTemp.getThirdRetailPremiums()));
+//
+//        //交强费转换赋值
+//        OrderFeeVo jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
+//        jqOrderFeeVo.setFirstDeptPremiums(convertToString(jqInsFeeOrderTemp.getFirstDeptPremiums()));
+//        jqOrderFeeVo.setSecondDeptPremiums(convertToString(jqInsFeeOrderTemp.getSecondDeptPremiums()));
+//        jqOrderFeeVo.setThirdDeptPremiums(convertToString(jqInsFeeOrderTemp.getThirdDeptPremiums()));
+//        jqOrderFeeVo.setForthDeptPremiums(convertToString(jqInsFeeOrderTemp.getForthDeptPremiums()));
+//        jqOrderFeeVo.setFifthDeptPremiums(convertToString(jqInsFeeOrderTemp.getFifthDeptPremiums()));
+//        jqOrderFeeVo.setFirstRetailPremiums(convertToString(jqInsFeeOrderTemp.getFirstRetailPremiums()));
+//        jqOrderFeeVo.setSecondRetailPremiums(convertToString(jqInsFeeOrderTemp.getSecondRetailPremiums()));
+//        jqOrderFeeVo.setThirdRetailPremiums(convertToString(jqInsFeeOrderTemp.getThirdRetailPremiums()));
+//
+//        //商业费转换赋值
+//        OrderFeeVo syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
+//        syOrderFeeVo.setFirstDeptPremiums(convertToString(syInsFeeOrderTemp.getFirstDeptPremiums()));
+//        syOrderFeeVo.setSecondDeptPremiums(convertToString(syInsFeeOrderTemp.getSecondDeptPremiums()));
+//        syOrderFeeVo.setThirdDeptPremiums(convertToString(syInsFeeOrderTemp.getThirdDeptPremiums()));
+//        syOrderFeeVo.setForthDeptPremiums(convertToString(syInsFeeOrderTemp.getForthDeptPremiums()));
+//        syOrderFeeVo.setFifthDeptPremiums(convertToString(syInsFeeOrderTemp.getFifthDeptPremiums()));
+//        syOrderFeeVo.setFirstRetailPremiums(convertToString(syInsFeeOrderTemp.getFirstRetailPremiums()));
+//        syOrderFeeVo.setSecondRetailPremiums(convertToString(syInsFeeOrderTemp.getSecondRetailPremiums()));
+//        syOrderFeeVo.setThirdRetailPremiums(convertToString(syInsFeeOrderTemp.getThirdRetailPremiums()));
+//
+//        queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
+//        queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
+//        return queryOrderFeeVo;
+//    }
 
     /**
      * 按照单险种方式获取费用明细
@@ -1907,26 +2076,26 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
      * @param insFeeOrder
      * @return
      */
-    private OrderFeeVo packageOrderFeeInfoOne(InsFeeOrder insFeeOrder) {
-        OrderFeeVo orderFeeVo = new OrderFeeVo();
-        orderFeeVo.setFirstDeptPremiums(convertToString(insFeeOrder.getFirstDeptPremiums()));
-        orderFeeVo.setFirstDeptProportion(convertToString(insFeeOrder.getFirstDeptProportion()));
-        orderFeeVo.setSecondDeptPremiums(convertToString(insFeeOrder.getSecondDeptPremiums()));
-        orderFeeVo.setSecondDeptProportion(convertToString(insFeeOrder.getSecondDeptProportion()));
-        orderFeeVo.setThirdDeptPremiums(convertToString(insFeeOrder.getThirdDeptPremiums()));
-        orderFeeVo.setThirdDeptProportion(convertToString(insFeeOrder.getThirdDeptProportion()));
-        orderFeeVo.setForthDeptPremiums(convertToString(insFeeOrder.getForthDeptPremiums()));
-        orderFeeVo.setForthDeptProportion(convertToString(insFeeOrder.getForthDeptProportion()));
-        orderFeeVo.setFifthDeptPremiums(convertToString(insFeeOrder.getFifthDeptPremiums()));
-        orderFeeVo.setFifthDeptProportion(convertToString(insFeeOrder.getFifthDeptProportion()));
-        orderFeeVo.setFirstRetailPremiums(convertToString(insFeeOrder.getFirstRetailPremiums()));
-        orderFeeVo.setFirstRetailProportion(convertToString(insFeeOrder.getFirstRetailProportion()));
-        orderFeeVo.setSecondRetailPremiums(convertToString(insFeeOrder.getSecondRetailPremiums()));
-        orderFeeVo.setSecondRetailProportion(convertToString(insFeeOrder.getSecondRetailProportion()));
-        orderFeeVo.setThirdRetailPremiums(convertToString(insFeeOrder.getThirdRetailPremiums()));
-        orderFeeVo.setThirdRetailProportion(convertToString(insFeeOrder.getThirdRetailProportion()));
-        return orderFeeVo;
-    }
+//    private OrderFeeVo packageOrderFeeInfoOne(InsFeeOrder insFeeOrder) {
+//        OrderFeeVo orderFeeVo = new OrderFeeVo();
+//        orderFeeVo.setFirstDeptPremiums(convertToString(insFeeOrder.getFirstDeptPremiums()));
+//        orderFeeVo.setFirstDeptProportion(convertToString(insFeeOrder.getFirstDeptProportion()));
+//        orderFeeVo.setSecondDeptPremiums(convertToString(insFeeOrder.getSecondDeptPremiums()));
+//        orderFeeVo.setSecondDeptProportion(convertToString(insFeeOrder.getSecondDeptProportion()));
+//        orderFeeVo.setThirdDeptPremiums(convertToString(insFeeOrder.getThirdDeptPremiums()));
+//        orderFeeVo.setThirdDeptProportion(convertToString(insFeeOrder.getThirdDeptProportion()));
+//        orderFeeVo.setForthDeptPremiums(convertToString(insFeeOrder.getForthDeptPremiums()));
+//        orderFeeVo.setForthDeptProportion(convertToString(insFeeOrder.getForthDeptProportion()));
+//        orderFeeVo.setFifthDeptPremiums(convertToString(insFeeOrder.getFifthDeptPremiums()));
+//        orderFeeVo.setFifthDeptProportion(convertToString(insFeeOrder.getFifthDeptProportion()));
+//        orderFeeVo.setFirstRetailPremiums(convertToString(insFeeOrder.getFirstRetailPremiums()));
+//        orderFeeVo.setFirstRetailProportion(convertToString(insFeeOrder.getFirstRetailProportion()));
+//        orderFeeVo.setSecondRetailPremiums(convertToString(insFeeOrder.getSecondRetailPremiums()));
+//        orderFeeVo.setSecondRetailProportion(convertToString(insFeeOrder.getSecondRetailProportion()));
+//        orderFeeVo.setThirdRetailPremiums(convertToString(insFeeOrder.getThirdRetailPremiums()));
+//        orderFeeVo.setThirdRetailProportion(convertToString(insFeeOrder.getThirdRetailProportion()));
+//        return orderFeeVo;
+//    }
 
     private String convertToString(BigDecimal b) {
         if (b != null) {

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

@@ -123,6 +123,10 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
         insFeeOrderNew.setId(IdGenerate.nextId());
         insFeeOrderNew.setAgreementId(ptlAgreementProductCostsNew.getAgreementId());
+        //存储部门id与用户id
+        InsOrders order = insOrdersService.getById(insAreaCompany.getOrderno());
+        insFeeOrderNew.setDeptId(order.getDeptid());
+        insFeeOrderNew.setUserId(order.getUserid());
         insFeeOrderNew.setInsOrderNo(insAreaCompany.getId());
         insFeeOrderNew.setJqPremium(insAreaCompany.getJqpremium());
         insFeeOrderNew.setSyPremium(insAreaCompany.getSypremium());
@@ -208,93 +212,123 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
 
         //设置出口费用
+        //每级的加投费用为 计算出每级管理费的占比   *   加投费用
+        //（一级管理费比例 / 总费用比例） * 加投费用
+        BigDecimal jqInvestmentCostsLevel1 = new BigDecimal(0);
+        BigDecimal jqInvestmentCostsLevel2 = new BigDecimal(0);
+        BigDecimal jqInvestmentCostsLevel3 = new BigDecimal(0);
+        BigDecimal jqInvestmentCostsLevel4 = new BigDecimal(0);
+        BigDecimal jqInvestmentCostsLevel5 = new BigDecimal(0);
+        BigDecimal syInvestmentCostsLevel1 = new BigDecimal(0);
+        BigDecimal syInvestmentCostsLevel2 = new BigDecimal(0);
+        BigDecimal syInvestmentCostsLevel3 = new BigDecimal(0);
+        BigDecimal syInvestmentCostsLevel4 = new BigDecimal(0);
+        BigDecimal syInvestmentCostsLevel5 = new BigDecimal(0);
+        if(insFeeOrderNew.getJqInvestmentCostsProportion().compareTo(BigDecimal.ZERO) != 0)
+        {
+            jqInvestmentCostsLevel1 =  ptlAgreementProductCostsExport.getJqExportRadioLevel1().divide(insFeeOrderNew.getJqCostsProportion()).multiply(insFeeOrderNew.getJqInvestmentCostsPremiums());
+            jqInvestmentCostsLevel2 =  ptlAgreementProductCostsExport.getJqExportRadioLevel2().divide(insFeeOrderNew.getJqCostsProportion()).multiply(insFeeOrderNew.getJqInvestmentCostsPremiums());
+            jqInvestmentCostsLevel3 =  ptlAgreementProductCostsExport.getJqExportRadioLevel3().divide(insFeeOrderNew.getJqCostsProportion()).multiply(insFeeOrderNew.getJqInvestmentCostsPremiums());
+            jqInvestmentCostsLevel4 =  ptlAgreementProductCostsExport.getJqExportRadioLevel4().divide(insFeeOrderNew.getJqCostsProportion()).multiply(insFeeOrderNew.getJqInvestmentCostsPremiums());
+            jqInvestmentCostsLevel5 =  ptlAgreementProductCostsExport.getJqExportRadioLevel5().divide(insFeeOrderNew.getJqCostsProportion()).multiply(insFeeOrderNew.getJqInvestmentCostsPremiums());
+        }
+        if(insFeeOrderNew.getSyInvestmentCostsProportion().compareTo(BigDecimal.ZERO) != 0)
+        {
+            syInvestmentCostsLevel1 =  ptlAgreementProductCostsExport.getSyExportRadioLevel1().divide(insFeeOrderNew.getSyCostsProportion()).multiply(insFeeOrderNew.getSyInvestmentCostsPremiums());
+            syInvestmentCostsLevel2 =  ptlAgreementProductCostsExport.getSyExportRadioLevel2().divide(insFeeOrderNew.getSyCostsProportion()).multiply(insFeeOrderNew.getSyInvestmentCostsPremiums());
+            syInvestmentCostsLevel3 =  ptlAgreementProductCostsExport.getSyExportRadioLevel3().divide(insFeeOrderNew.getSyCostsProportion()).multiply(insFeeOrderNew.getSyInvestmentCostsPremiums());
+            syInvestmentCostsLevel4 =  ptlAgreementProductCostsExport.getSyExportRadioLevel4().divide(insFeeOrderNew.getSyCostsProportion()).multiply(insFeeOrderNew.getSyInvestmentCostsPremiums());
+            syInvestmentCostsLevel5 =  ptlAgreementProductCostsExport.getSyExportRadioLevel5().divide(insFeeOrderNew.getSyCostsProportion()).multiply(insFeeOrderNew.getSyInvestmentCostsPremiums());
+        }
+
+
         //交强出口比例
-        insFeeOrderNew.setJqDeptProportionLevel1(new BigDecimal(ptlAgreementProductCostsExport.getJqExportRadioLevel1()));
+        insFeeOrderNew.setJqDeptProportionLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1());
         insFeeOrderNew.setJqDeptPremiumsLevel1(
-                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel1()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel1()).divide(new BigDecimal("100")).add(jqInvestmentCostsLevel1)
         );
 
-        insFeeOrderNew.setJqDeptProportionLevel2(new BigDecimal(ptlAgreementProductCostsExport.getJqExportRadioLevel2()));
+        insFeeOrderNew.setJqDeptProportionLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2());
         insFeeOrderNew.setJqDeptPremiumsLevel2(
-                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel2()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel2()).divide(new BigDecimal("100")).add(jqInvestmentCostsLevel2)
         );
 
-        insFeeOrderNew.setJqDeptProportionLevel3(new BigDecimal(ptlAgreementProductCostsExport.getJqExportRadioLevel3()));
+        insFeeOrderNew.setJqDeptProportionLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3());
         insFeeOrderNew.setJqDeptPremiumsLevel3(
-                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel3()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel3()).divide(new BigDecimal("100")).add(jqInvestmentCostsLevel3)
         );
 
-        insFeeOrderNew.setJqDeptProportionLevel4(new BigDecimal(ptlAgreementProductCostsExport.getJqExportRadioLevel4()));
+        insFeeOrderNew.setJqDeptProportionLevel4(ptlAgreementProductCostsExport.getJqExportRadioLevel4());
         insFeeOrderNew.setJqDeptPremiumsLevel4(
-                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel4()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel4()).divide(new BigDecimal("100")).add(jqInvestmentCostsLevel4)
         );
 
-        insFeeOrderNew.setJqDeptProportionLevel5(new BigDecimal(ptlAgreementProductCostsExport.getJqExportRadioLevel5()));
+        insFeeOrderNew.setJqDeptProportionLevel5(ptlAgreementProductCostsExport.getJqExportRadioLevel5());
         insFeeOrderNew.setJqDeptPremiumsLevel5(
-                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel5()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqDeptProportionLevel5()).divide(new BigDecimal("100")).add(jqInvestmentCostsLevel5)
         );
 
-        insFeeOrderNew.setJqExportInvestmentProportion(new BigDecimal(ptlAgreementProductCostsExport.getJqExportInvestmentRadio()));
+        insFeeOrderNew.setJqExportInvestmentProportion(ptlAgreementProductCostsExport.getJqExportInvestmentRadio());
         insFeeOrderNew.setJqExportInvestmentPremiums(
                 insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqExportInvestmentProportion()).divide(new BigDecimal("100"))
         );
 
         //商业出口比例
-        insFeeOrderNew.setSyDeptProportionLevel1(new BigDecimal(ptlAgreementProductCostsExport.getSyExportRadioLevel1()));
+        insFeeOrderNew.setSyDeptProportionLevel1(ptlAgreementProductCostsExport.getSyExportRadioLevel1());
         insFeeOrderNew.setSyDeptPremiumsLevel1(
-                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel1()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel1()).divide(new BigDecimal("100")).add(syInvestmentCostsLevel1)
         );
 
-        insFeeOrderNew.setSyDeptProportionLevel2(new BigDecimal(ptlAgreementProductCostsExport.getSyExportRadioLevel2()));
+        insFeeOrderNew.setSyDeptProportionLevel2(ptlAgreementProductCostsExport.getSyExportRadioLevel2());
         insFeeOrderNew.setSyDeptPremiumsLevel2(
-                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel2()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel2()).divide(new BigDecimal("100")).add(syInvestmentCostsLevel2)
         );
 
-        insFeeOrderNew.setSyDeptProportionLevel3(new BigDecimal(ptlAgreementProductCostsExport.getSyExportRadioLevel3()));
+        insFeeOrderNew.setSyDeptProportionLevel3(ptlAgreementProductCostsExport.getSyExportRadioLevel3());
         insFeeOrderNew.setSyDeptPremiumsLevel3(
-                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel3()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel3()).divide(new BigDecimal("100")).add(syInvestmentCostsLevel3)
         );
 
 
-        insFeeOrderNew.setSyDeptProportionLevel4(new BigDecimal(ptlAgreementProductCostsExport.getSyExportRadioLevel4()));
+        insFeeOrderNew.setSyDeptProportionLevel4(ptlAgreementProductCostsExport.getSyExportRadioLevel4());
         insFeeOrderNew.setSyDeptPremiumsLevel4(
-                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel4()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel4()).divide(new BigDecimal("100")).add(syInvestmentCostsLevel4)
         );
 
-        insFeeOrderNew.setSyDeptProportionLevel5(new BigDecimal(ptlAgreementProductCostsExport.getSyExportRadioLevel5()));
+        insFeeOrderNew.setSyDeptProportionLevel5(ptlAgreementProductCostsExport.getSyExportRadioLevel5());
         insFeeOrderNew.setSyDeptPremiumsLevel5(
-                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel5()).divide(new BigDecimal("100"))
+                insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyDeptProportionLevel5()).divide(new BigDecimal("100")).add(syInvestmentCostsLevel5)
         );
 
-        insFeeOrderNew.setSyExportInvestmentProportion(new BigDecimal(ptlAgreementProductCostsExport.getSyExportInvestmentRadio()));
+        insFeeOrderNew.setSyExportInvestmentProportion(ptlAgreementProductCostsExport.getSyExportInvestmentRadio());
         insFeeOrderNew.setSyExportInvestmentPremiums(
                 insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSyExportInvestmentProportion()).divide(new BigDecimal("100"))
         );
 
 
         //非车出口比例
-        insFeeOrderNew.setNoDeptProportionLevel1(new BigDecimal(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1()));
+        insFeeOrderNew.setNoDeptProportionLevel1(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1());
         insFeeOrderNew.setNoDeptPremiumsLevel1(
                 insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoDeptProportionLevel1()).divide(new BigDecimal("100"))
         );
 
-        insFeeOrderNew.setNoDeptProportionLevel2(new BigDecimal(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2()));
+        insFeeOrderNew.setNoDeptProportionLevel2(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2());
         insFeeOrderNew.setNoDeptPremiumsLevel2(
                 insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoDeptProportionLevel2()).divide(new BigDecimal("100"))
         );
 
-        insFeeOrderNew.setNoDeptProportionLevel3(new BigDecimal(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3()));
+        insFeeOrderNew.setNoDeptProportionLevel3(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3());
         insFeeOrderNew.setNoDeptPremiumsLevel3(
                 insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoDeptProportionLevel3()).divide(new BigDecimal("100"))
         );
 
 
-        insFeeOrderNew.setNoDeptProportionLevel4(new BigDecimal(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4()));
+        insFeeOrderNew.setNoDeptProportionLevel4(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4());
         insFeeOrderNew.setNoDeptPremiumsLevel4(
                 insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoDeptProportionLevel4()).divide(new BigDecimal("100"))
         );
 
-        insFeeOrderNew.setNoDeptProportionLevel5(new BigDecimal(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5()));
+        insFeeOrderNew.setNoDeptProportionLevel5(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
         insFeeOrderNew.setNoDeptPremiumsLevel5(
                 insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoDeptProportionLevel5()).divide(new BigDecimal("100"))
         );
@@ -396,8 +430,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
 
     private boolean verificationRules(List<PtlAgreementUndwrtRulesNew> ptlAgreementUndwrtRulesNews,InsAreaCompany insAreaCompany,InsOrders insOrders){
-        //匹配费用因子
-        //获取所有费用属性
+        //匹配承保规则
+        //获取所有承保规则属性
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         //获取所有费用属性关联
         List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(insAreaCompany, insOrders);

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -1,7 +1,10 @@
 package com.ydtech.modules.fnc.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.fnc.dao.FncInsAreaCompanyMapper;
@@ -23,8 +26,11 @@ import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.service.InsFeeOrderService;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.DateUtil;
 import com.ydtech.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -59,6 +65,12 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     private final SysUserService sysUserService;
 
+    @Autowired
+    private InsFeeOrderNewService insFeeOrderNewService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
 
     public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
         this.insAreaCompanyMapper = insAreaCompanyMapper;
@@ -74,6 +86,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     @Override
     @Transactional
     public void feeAudit(String orderNo, String insOrderNo) throws Exception{
+        //保存审核表
         InsFeeAudit insFeeAudit=new InsFeeAudit();
         insFeeAudit.setOrderno(orderNo);
         insFeeAudit.setInsOrderNo(insOrderNo);
@@ -82,12 +95,29 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insFeeAudit.setAudituser(StpUtil.getLoginId().toString());
         this.save(insFeeAudit);
 
+
         InsOrders order=insOrdersMapper.selectById(orderNo);
         InsFeeOrder insFeeOrder=insFeeOrderService.getByInsOrderNo(insFeeAudit.getInsOrderNo());
         InsAreaCompany insAreaCompany=insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
 
+        //获取该订单的费用
+        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
+                .eq(InsFeeOrderNew::getInsOrderNo, insFeeAudit.getInsOrderNo()));
+
+
+        //获取操作人员的机构来源
+        String deptId=order.getDeptid();
+
+        List<SysDept> teamList = sysDeptService.findTeamList(deptId);
+        teamList.forEach(sysDept -> {
+            if(sysDept.getComlevel().equals("1")){
+                BigDecimal jqDeptPremiumsLevel1 = insFeeOrderNew.getJqDeptPremiumsLevel1();
+            }
+        });
+
+
         //bigdecimal为null时设置为0
-        handleBigdecimal(insFeeOrder);
+//        handleBigdecimal(insFeeOrder);
         //生成保司费用（应收费用）
         gene_orderIncome( order, insFeeOrder,insAreaCompany);
         //生成机构费用
@@ -98,42 +128,6 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         saveInsCompanyFee(order,insFeeOrder,insAreaCompany);
     }
 
-    private void handleBigdecimal(InsFeeOrder insFeeOrder)
-    {
-        insFeeOrder.setJqCostsProportion(insFeeOrder.getJqCostsProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getJqCostsProportion());
-        insFeeOrder.setSyCostsProportion(insFeeOrder.getSyCostsProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getSyCostsProportion());
-        insFeeOrder.setJqCostsPremiums(insFeeOrder.getJqCostsPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getJqCostsPremiums());
-        insFeeOrder.setSyCostsPremiums(insFeeOrder.getSyCostsPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getSyCostsPremiums());
-        insFeeOrder.setJqPremium(insFeeOrder.getJqPremium() ==null ? BigDecimal.ZERO:insFeeOrder.getJqPremium());
-        insFeeOrder.setSyPremium(insFeeOrder.getSyPremium() ==null ? BigDecimal.ZERO:insFeeOrder.getSyPremium());
-        insFeeOrder.setJqNoTaxPremium(insFeeOrder.getJqNoTaxPremium() ==null ? BigDecimal.ZERO:insFeeOrder.getJqNoTaxPremium());
-        insFeeOrder.setSyNoTaxPremium(insFeeOrder.getSyNoTaxPremium() ==null ? BigDecimal.ZERO:insFeeOrder.getSyNoTaxPremium());
-        insFeeOrder.setJqSuperviseCostsProportion(insFeeOrder.getJqSuperviseCostsProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getJqSuperviseCostsProportion());
-        insFeeOrder.setJqSuperviseCostsPremiums(insFeeOrder.getJqSuperviseCostsPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getJqSuperviseCostsPremiums());
-        insFeeOrder.setSySuperviseCostsProportion(insFeeOrder.getSySuperviseCostsProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getSySuperviseCostsProportion());
-        insFeeOrder.setSySuperviseCostsPremiums(insFeeOrder.getSySuperviseCostsPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getSySuperviseCostsPremiums());
-        insFeeOrder.setJqSpilloverProportion(insFeeOrder.getJqSpilloverProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getJqSpilloverProportion());
-        insFeeOrder.setJqSpilloverPremiums(insFeeOrder.getJqSpilloverPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getJqSpilloverPremiums());
-        insFeeOrder.setSySpilloverProportion(insFeeOrder.getSySpilloverProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getSySpilloverProportion());
-        insFeeOrder.setSySpilloverPremiums(insFeeOrder.getSySpilloverPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getSySpilloverPremiums());
-        insFeeOrder.setFirstDeptProportion(insFeeOrder.getFirstDeptProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getFirstDeptProportion());
-        insFeeOrder.setFirstDeptPremiums(insFeeOrder.getFirstDeptPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getFirstDeptPremiums());
-        insFeeOrder.setSecondDeptProportion(insFeeOrder.getSecondDeptProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getSecondDeptProportion());
-        insFeeOrder.setSecondDeptPremiums(insFeeOrder.getSecondDeptPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getSecondDeptPremiums());
-        insFeeOrder.setThirdDeptProportion(insFeeOrder.getThirdDeptProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getThirdDeptProportion());
-        insFeeOrder.setThirdDeptPremiums(insFeeOrder.getThirdDeptPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getThirdDeptPremiums());
-        insFeeOrder.setForthDeptProportion(insFeeOrder.getForthDeptProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getForthDeptProportion());
-        insFeeOrder.setForthDeptPremiums(insFeeOrder.getForthDeptPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getForthDeptPremiums());
-        insFeeOrder.setFifthDeptProportion(insFeeOrder.getFifthDeptProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getFifthDeptProportion());
-        insFeeOrder.setFifthDeptPremiums(insFeeOrder.getFifthDeptPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getFifthDeptPremiums());
-        insFeeOrder.setFirstRetailProportion(insFeeOrder.getFirstRetailProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getFirstRetailProportion());
-        insFeeOrder.setFirstRetailPremiums(insFeeOrder.getFirstRetailPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getFirstRetailPremiums());
-        insFeeOrder.setSecondRetailProportion(insFeeOrder.getSecondRetailProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getSecondRetailProportion());
-        insFeeOrder.setSecondRetailPremiums(insFeeOrder.getSecondRetailPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getSecondRetailPremiums());
-        insFeeOrder.setThirdRetailProportion(insFeeOrder.getThirdRetailProportion() ==null ? BigDecimal.ZERO:insFeeOrder.getThirdRetailProportion());
-        insFeeOrder.setThirdRetailPremiums(insFeeOrder.getThirdRetailPremiums() ==null ? BigDecimal.ZERO:insFeeOrder.getThirdRetailPremiums());
-
-    }
     /**
      * 生成保司费用（应收费用）
      * @param order
@@ -210,36 +204,26 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     private void geneInsDeptFee(InsOrders order, InsFeeOrder insFeeOrder, InsDeptFee deptFee) {
         if (insFeeOrder.getFirstDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01
-            deptFee.setKeeprate(insFeeOrder.getFirstDeptProportion().doubleValue() );
-            deptFee.setKeepamount(insFeeOrder.getFirstDeptPremiums().doubleValue());
             deptFee.setComlevel("一级");
             insDeptFeeService.insert(deptFee);
         }
         if (insFeeOrder.getSecondDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 4));  //99140302M01D01
-            deptFee.setKeeprate(insFeeOrder.getSecondDeptProportion().doubleValue() );
-            deptFee.setKeepamount(insFeeOrder.getSecondDeptPremiums().doubleValue());
             deptFee.setComlevel("二级");
             insDeptFeeService.insert(deptFee);
         }
         if (insFeeOrder.getThirdDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 6));  //99140302M01D01
-            deptFee.setKeeprate(insFeeOrder.getThirdDeptProportion().doubleValue() );
-            deptFee.setKeepamount(insFeeOrder.getThirdDeptPremiums().doubleValue());
             deptFee.setComlevel("三级");
             insDeptFeeService.insert(deptFee);
         }
         if (insFeeOrder.getForthDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 8));  //99140302M01D01
-            deptFee.setKeeprate(insFeeOrder.getForthDeptProportion().doubleValue() );
-            deptFee.setKeepamount(insFeeOrder.getForthDeptPremiums().doubleValue());
             deptFee.setComlevel("四级");
             insDeptFeeService.insert(deptFee);
         }
         if (insFeeOrder.getFifthDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 11));  //99140302M01D01
-            deptFee.setKeeprate(insFeeOrder.getFifthDeptProportion().doubleValue() );
-            deptFee.setKeepamount(insFeeOrder.getFifthDeptPremiums().doubleValue());
             deptFee.setComlevel("五级");
             insDeptFeeService.insert(deptFee);
         }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyMainServiceImpl.java

@@ -223,36 +223,26 @@ public class InsPlyMainServiceImpl extends ServiceImpl<InsPlyMainMapper, InsPlyM
     private void geneInsDeptFee(InsDeptFee deptFee,InsPlyMain excelVo) {
         if (excelVo.getFirstDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(excelVo.getDeptId().substring(0, 2));  //99140302M01D01
-            deptFee.setKeeprate(excelVo.getFirstDeptProportion().doubleValue() );
-            deptFee.setKeepamount(excelVo.getFirstDeptPremiums().doubleValue());
             deptFee.setComlevel("一级");
             insDeptFeeService.insert(deptFee);
         }
         if (excelVo.getSecondDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(excelVo.getDeptId().substring(0, 4));  //99140302M01D01
-            deptFee.setKeeprate(excelVo.getSecondDeptProportion().doubleValue() );
-            deptFee.setKeepamount(excelVo.getSecondDeptPremiums().doubleValue());
             deptFee.setComlevel("二级");
             insDeptFeeService.insert(deptFee);
         }
         if (excelVo.getThirdDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(excelVo.getDeptId().substring(0, 6));  //99140302M01D01
-            deptFee.setKeeprate(excelVo.getThirdDeptProportion().doubleValue() );
-            deptFee.setKeepamount(excelVo.getThirdDeptPremiums().doubleValue());
             deptFee.setComlevel("三级");
             insDeptFeeService.insert(deptFee);
         }
         if (excelVo.getForthDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(excelVo.getDeptId().substring(0, 8));  //99140302M01D01
-            deptFee.setKeeprate(excelVo.getForthDeptProportion().doubleValue() );
-            deptFee.setKeepamount(excelVo.getForthDeptPremiums().doubleValue());
             deptFee.setComlevel("四级");
             insDeptFeeService.insert(deptFee);
         }
         if (excelVo.getFifthDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(excelVo.getDeptId().substring(0, 11));  //99140302M01D01
-            deptFee.setKeeprate(excelVo.getFifthDeptProportion().doubleValue() );
-            deptFee.setKeepamount(excelVo.getFifthDeptPremiums().doubleValue());
             deptFee.setComlevel("五级");
             insDeptFeeService.insert(deptFee);
         }

src/main/java/com/ydtech/modules/ins/controller/InsOrderController.java

@@ -1288,14 +1288,6 @@ public class InsOrderController extends BaseController {
 
         List<EsmAgreementProdfee> prodfees = esmAgreementProdfeeService.selectList(" where agreeprodid=?", new Object[]{order.getProductid()});
         for (EsmAgreementProdfee prodfee : prodfees) {
-            deptFee.setKeeprate(prodfee.getKeeprate() * 0.01);
-            BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getKeeprate() * 0.01);
-            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-            deptFee.setKeepamount(amount.doubleValue());
-            deptFee.setAddrate(prodfee.getAddrate() * 0.01);
-            amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getAddrate() * 0.01);
-            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-            deptFee.setAddamount(amount.doubleValue());
             deptFee.setComlevel(prodfee.getComlevel());
             if ("一级".equals(prodfee.getComlevel())) {
                 deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01

src/main/java/com/ydtech/modules/ins/controller/InsTiananController.java

@@ -965,14 +965,6 @@ public class InsTiananController {
         deptFee.setSettlestatus("0");
         List<EsmAgreementProdfee> prodfees = esmAgreementProdfeeService.selectList(" where agreeprodid=?", new Object[]{order.getProductid()});
         for (EsmAgreementProdfee prodfee : prodfees) {
-            deptFee.setKeeprate(prodfee.getKeeprate() * 0.01);
-            BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getKeeprate() * 0.01);
-            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-            deptFee.setKeepamount(amount.doubleValue());
-            deptFee.setAddrate(prodfee.getAddrate() * 0.01);
-            amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getAddrate() * 0.01);
-            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-            deptFee.setAddamount(amount.doubleValue());
             deptFee.setComlevel(prodfee.getComlevel());
             if ("一级".equals(prodfee.getComlevel())) {
                 deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01

src/main/java/com/ydtech/modules/ins/dao/impl/InsDeptFeeDaoImpl.java

@@ -36,10 +36,6 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
             model.setAgreeprodid(resultSet.getString("agreeprodid"));
             model.setComlevel(resultSet.getString("comlevel"));
             model.setComcode(resultSet.getString("comcode"));
-            model.setKeeprate(resultSet.getDouble("keeprate"));
-            model.setAddrate(resultSet.getDouble("addrate"));
-            model.setKeepamount(resultSet.getDouble("keepamount"));
-            model.setAddamount(resultSet.getDouble("addamount"));
             model.setAuditstatus(resultSet.getString("auditstatus"));
             model.setSettlestatus(resultSet.getString("settlestatus"));
             model.setLicenseno(resultSet.getString("licenseno"));
@@ -164,12 +160,12 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
     @Override
     public Integer insert(InsDeptFee model) {
 
-        String sql = "insert into ins_deptfee (orderno,policyno,inscompany,licenseno,riskcode,quoteno,agreeid,agreeprodid,comlevel,comcode,keeprate,addrate,keepamount,addamount,auditstatus,settlestatus) " +
-                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+        String sql = "insert into ins_deptfee (orderno,policyno,inscompany,licenseno,riskcode,quoteno,agreeid,agreeprodid,comlevel,comcode,auditstatus,settlestatus) " +
+                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getInscompany(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getKeeprate(), model.getAddrate(), model.getKeepamount(), model.getAddamount(), model.getAuditstatus(), model.getSettlestatus()};
+        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getInscompany(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getAuditstatus(), model.getSettlestatus()};
 
         int out = jdbcTemplate.update(sql, params);
 
@@ -179,11 +175,11 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
     @Override
     public Integer update(InsDeptFee model) {
 
-        String sql = "update ins_deptfee set quoteno=?,agreeid=?,agreeprodid=?,comlevel=?,comcode=?,keeprate=?,addrate=?,keepamount=?,addamount=?,auditstatus=?,settlestatus=? where orderno=?";
+        String sql = "update ins_deptfee set quoteno=?,agreeid=?,agreeprodid=?,comlevel=?,comcode=?,auditstatus=?,settlestatus=? where orderno=?";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getKeeprate(), model.getAddrate(), model.getKeepamount(), model.getAddamount(), model.getAuditstatus(), model.getSettlestatus(), model.getOrderno()};
+        Object[] params = new Object[]{model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getAuditstatus(), model.getSettlestatus(), model.getOrderno()};
 
         return jdbcTemplate.update(sql, params);
     }

src/main/java/com/ydtech/modules/ins/model/InsDeptFee.java

@@ -16,10 +16,6 @@ public class InsDeptFee {
     private String agreeprodid;
     private String comlevel;
     private String comcode;
-    private double keeprate;
-    private double addrate;
-    private double keepamount;
-    private double addamount;
     private String auditstatus;
     private String settlestatus;
     private String licenseno;

src/main/java/com/ydtech/modules/inv/model/excel/InvSourceExcel.java

@@ -249,6 +249,11 @@ public class InvSourceExcel implements Serializable {
      */
     @ExcelProperty("结算状态")
     private String clearingState;
+    /**
+     *保司结算状态
+     */
+    @ExcelProperty("保司结算状态")
+    private String insuranceClearingState;
 
     @ExcelProperty("导入日期")
     @JsonFormat(pattern = "yyyy年MM月dd日")

src/main/java/com/ydtech/modules/order/aop/aspect/AuditVerificationAspect.java

@@ -59,7 +59,6 @@ public class AuditVerificationAspect {
             //再进行费用因子判断
             feeRuleSchemeNewService.verificationCostFactor(insAreaCompany,insOrders);
         }
-        throw new SystemException("没有找到费用，核保失败!");
     }
 
 }

src/main/java/com/ydtech/modules/order/controller/DaJiaOrderController.java

@@ -4,6 +4,7 @@ package com.ydtech.modules.order.controller;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
@@ -43,8 +44,10 @@ public class DaJiaOrderController {
     @ApiOperation(value = "提交影像信息")
     public HttpResult<Object> submitImage(@RequestSingleParam(value = "companyId") String companyId) {
         return this.daJiaOrderService.submitImage(companyId);
+//        return HttpResult.ok("ok");
     }
 
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) {

src/main/java/com/ydtech/modules/order/entity/vo/OrderFeeVo.java

@@ -16,77 +16,284 @@ public class OrderFeeVo implements Serializable {
     private static final long serialVersionUID = -4906378446672825846L;
 
     /**
-     * 费用比例
+     * 交强手续费比例
      */
-    @JsonProperty("costsProportion")
-    private String costsProportion;
+    @JsonProperty("jqSuperviseCostsProportion")
+    private String jqSuperviseCostsProportion;
+
+    /**
+     * 交强手续费
+     */
+    @JsonProperty("jqSuperviseCostsPremiums")
+    private String jqSuperviseCostsPremiums;
+
+    /**
+     * 交强跟单费比例
+     */
+    @JsonProperty("jqOtherCostsProportion")
+    private String jqOtherCostsProportion;
+
+    /**
+     * 交强跟单费
+     */
+    @JsonProperty("jqOtherCostsPremiums")
+    private String jqOtherCostsPremiums;
+
+    /**
+     * 交强加投费用比例
+     */
+    @JsonProperty("jqInvestmentCostsProportion")
+    private String jqInvestmentCostsProportion;
+
+    /**
+     * 交强加投费
+     */
+    @JsonProperty("jqInvestmentCostsPremiums")
+    private String jqInvestmentCostsPremiums;
+
+
+    /**
+     * 商业手续费比例
+     */
+    @JsonProperty("sySuperviseCostsProportion")
+    private String sySuperviseCostsProportion;
+
+    /**
+     * 商业手续费
+     */
+    @JsonProperty("sySuperviseCostsPremiums")
+    private String sySuperviseCostsPremiums;
+
+    /**
+     * 商业跟单费比例
+     */
+    @JsonProperty("syOtherCostsProportion")
+    private String syOtherCostsProportion;
+
+    /**
+     * 商业跟单费
+     */
+    @JsonProperty("syOtherCostsPremiums")
+    private String syOtherCostsPremiums;
+
+    /**
+     * 商业加投费用比例
+     */
+    @JsonProperty("syInvestmentCostsProportion")
+    private String syInvestmentCostsProportion;
+
+    /**
+     * 商业加投费
+     */
+    @JsonProperty("syInvestmentCostsPremiums")
+    private String syInvestmentCostsPremiums;
+
+
+    /**
+     * 非车手续费比例
+     */
+    @JsonProperty("noSuperviseCostsProportion")
+    private String noSuperviseCostsProportion;
+
+    /**
+     * 非车手续费
+     */
+    @JsonProperty("noSuperviseCostsPremiums")
+    private String noSuperviseCostsPremiums;
+
     /**
-     * 总费用
+     * 非车跟单费比例
      */
-    @JsonProperty("costsPremiums")
-    private String costsPremiums;
+    @JsonProperty("noOtherCostsProportion")
+    private String noOtherCostsProportion;
 
     /**
-     * 费用比例
+     * 非车跟单费
      */
-    @JsonProperty("costsProportionAll")
-    private String costsProportionAll;
+    @JsonProperty("noOtherCostsPremiums")
+    private String noOtherCostsPremiums;
+
     /**
-     * 总费用
+     * 交强一级机构管理费比例
      */
-    @JsonProperty("costsPremiumsAll")
-    private String costsPremiumsAll;
+    @JsonProperty("jqDeptProportionLevel1")
+    private String jqDeptProportionLevel1;
 
     /**
-     * 一级机构管理费比例
+     * 交强一级机构管理费
      */
-    @JsonProperty("firstDeptProportion")
-    private String firstDeptProportion;
+    @JsonProperty("jqDeptPremiumsLevel1")
+    private String jqDeptPremiumsLevel1;
+
     /**
-     * 一级机构管理费
+     * 交强二级机构管理费比例
      */
-    @JsonProperty("firstDeptPremiums")
-    private String firstDeptPremiums;
+    @JsonProperty("jqDeptProportionLevel2")
+    private String jqDeptProportionLevel2;
+
     /**
-     * 二级机构管理费比例
+     * 交强二级机构管理费
      */
-    @JsonProperty("secondDeptProportion")
-    private String secondDeptProportion;
+    @JsonProperty("jqDeptPremiumsLevel2")
+    private String jqDeptPremiumsLevel2;
+
+    /**
+     * 交强三级机构管理费比例
+     */
+    @JsonProperty("jqDeptProportionLevel3")
+    private String jqDeptProportionLevel3;
+
     /**
-     * 二级机构管理费
+     * 交强三级机构管理费
      */
-    @JsonProperty("secondDeptPremiums")
-    private String secondDeptPremiums;
+    @JsonProperty("jqDeptPremiumsLevel3")
+    private String jqDeptPremiumsLevel3;
+
     /**
-     * 三级机构管理费比例
+     * 交强四级机构管理费比例
      */
-    @JsonProperty("thirdDeptProportion")
-    private String thirdDeptProportion;
+    @JsonProperty("jqDeptProportionLevel4")
+    private String jqDeptProportionLevel4;
+
     /**
-     * 三级机构管理费
+     * 交强四级机构管理费
      */
-    @JsonProperty("thirdDeptPremiums")
-    private String thirdDeptPremiums;
+    @JsonProperty("jqDeptPremiumsLevel4")
+    private String jqDeptPremiumsLevel4;
+
     /**
-     * 四级机构管理费比例
+     * 交强五级机构管理费比例
      */
-    @JsonProperty("forthDeptProportion")
-    private String forthDeptProportion;
+    @JsonProperty("jqDeptProportionLevel5")
+    private String jqDeptProportionLevel5;
+
     /**
-     * 四级机构管理费
+     * 交强五级机构管理费
      */
-    @JsonProperty("forthDeptPremiums")
-    private String forthDeptPremiums;
+    @JsonProperty("jqDeptPremiumsLevel5")
+    private String jqDeptPremiumsLevel5;
+
     /**
-     * 五级机构管理费比例
+     * 商业一级机构管理费比例
      */
-    @JsonProperty("fifthDeptProportion")
-    private String fifthDeptProportion;
+    @JsonProperty("syDeptProportionLevel1")
+    private String syDeptProportionLevel1;
+
     /**
-     * 五级机构管理费
+     * 商业一级机构管理费
      */
-    @JsonProperty("fifthDeptPremiums")
-    private String fifthDeptPremiums;
+    @JsonProperty("syDeptPremiumsLevel1")
+    private String syDeptPremiumsLevel1;
+
+    /**
+     * 商业二级机构管理费比例
+     */
+    @JsonProperty("syDeptProportionLevel2")
+    private String syDeptProportionLevel2;
+
+    /**
+     * 商业二级机构管理费
+     */
+    @JsonProperty("syDeptPremiumsLevel2")
+    private String syDeptPremiumsLevel2;
+
+    /**
+     * 商业三级机构管理费比例
+     */
+    @JsonProperty("syDeptProportionLevel3")
+    private String syDeptProportionLevel3;
+
+    /**
+     * 商业三级机构管理费
+     */
+    @JsonProperty("syDeptPremiumsLevel3")
+    private String syDeptPremiumsLevel3;
+
+    /**
+     * 商业四级机构管理费比例
+     */
+    @JsonProperty("syDeptProportionLevel4")
+    private String syDeptProportionLevel4;
+
+    /**
+     * 商业四级机构管理费
+     */
+    @JsonProperty("syDeptPremiumsLevel4")
+    private String syDeptPremiumsLevel4;
+
+    /**
+     * 商业五级机构管理费比例
+     */
+    @JsonProperty("syDeptProportionLevel5")
+    private String syDeptProportionLevel5;
+
+    /**
+     * 商业五级机构管理费
+     */
+    @JsonProperty("syDeptPremiumsLevel5")
+    private String syDeptPremiumsLevel5;
+
+    /**
+     * 非车一级机构管理费比例
+     */
+    @JsonProperty("noDeptProportionLevel1")
+    private String noDeptProportionLevel1;
+
+    /**
+     * 非车一级机构管理费
+     */
+    @JsonProperty("noDeptPremiumsLevel1")
+    private String noDeptPremiumsLevel1;
+
+    /**
+     * 非车二级机构管理费比例
+     */
+    @JsonProperty("noDeptProportionLevel2")
+    private String noDeptProportionLevel2;
+
+    /**
+     * 非车二级机构管理费
+     */
+    @JsonProperty("noDeptPremiumsLevel2")
+    private String noDeptPremiumsLevel2;
+
+    /**
+     * 非车三级机构管理费比例
+     */
+    @JsonProperty("noDeptProportionLevel3")
+    private String noDeptProportionLevel3;
+
+    /**
+     * 非车三级机构管理费
+     */
+    @JsonProperty("noDeptPremiumsLevel3")
+    private String noDeptPremiumsLevel3;
+
+    /**
+     * 非车四级机构管理费比例
+     */
+    @JsonProperty("noDeptProportionLevel4")
+    private String noDeptProportionLevel4;
+
+    /**
+     * 非车四级机构管理费
+     */
+    @JsonProperty("noDeptPremiumsLevel4")
+    private String noDeptPremiumsLevel4;
+
+    /**
+     * 非车五级机构管理费比例
+     */
+    @JsonProperty("noDeptProportionLevel5")
+    private String noDeptProportionLevel5;
+
+    /**
+     * 非车五级机构管理费
+     */
+    @JsonProperty("noDeptPremiumsLevel5")
+    private String noDeptPremiumsLevel5;
+
+
     /**
      * 一级分销比例
      */

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -53,10 +53,13 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsOrdersTrackService;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.SnowFlakeUtil;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -104,6 +107,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     private final InsFileMapper insFileMapper;
 
+    @Autowired
+    private InsFeeOrderNewService insFeeOrderNewService;
+
     @Value("${upload.file.path}")
     private String uploadFilePath;
 
@@ -527,25 +533,32 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         orderAndAreaCompany.setReptxt(null);
 
         //新增费用明细信息
-        QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
-        orderAndAreaCompany.setOrderCommissionVo(queryOrderFeeVo.getOrderCommissionVo());
-        orderAndAreaCompany.setAdjustFeeDescVo(queryOrderFeeVo.getAdjustFeeDescVo());
+//        QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
+        //查询费用信息
+        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
+                .eq(InsFeeOrderNew::getInsOrderNo, companyId));
+//        orderAndAreaCompany.setOrderCommissionVo(queryOrderFeeVo.getOrderCommissionVo());
+//        orderAndAreaCompany.setAdjustFeeDescVo(queryOrderFeeVo.getAdjustFeeDescVo());
         boolean isShowOrderFee = false;
         //如果是财务菜单进入的，不再进行权限控制，所有都可查看
-        if ("accountingUser".equals(userId)) {
-            isShowOrderFee = true;
-        } else {
-            //判断当前登录人员是否为后线人员，来决定是否返回总费用详情信息
-            List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId, "22");
-            if (userList != null && !userList.isEmpty()) {
-                isShowOrderFee = true;
-            }
-        }
-        if (isShowOrderFee) {
-            List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(queryOrderFeeVo);
-            if (!orderFeeVoList.isEmpty()) {
-                orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-            }
+//        if ("accountingUser".equals(userId)) {
+//            isShowOrderFee = true;
+//        } else {
+//            //判断当前登录人员是否为后线人员，来决定是否返回总费用详情信息
+//            List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId, "22");
+//            if (userList != null && !userList.isEmpty()) {
+//                isShowOrderFee = true;
+//            }
+//        }
+//        if (isShowOrderFee) {
+//            List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(queryOrderFeeVo);
+//            if (!orderFeeVoList.isEmpty()) {
+//                orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
+//            }
+//        }
+        if(!Objects.isNull(insFeeOrderNew)) {
+            List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
+            orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
         }
         //查询费用审核状态
         List<InsFeeAudit> feeAuditList = insFeeAuditService.query().eq("ins_order_no", companyId).list();

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementProductCostsServiceImpl.java

@@ -43,7 +43,6 @@ public class PtlAgreementProductCostsServiceImpl extends ServiceImpl<PtlAgreemen
 
     @Override
     public Page<PtlAgreementProductCosts> getByAgreementId(Page page, PtlAgreementProductQueryVo ptlAgreementProductQueryVo) {
-
         Page<PtlAgreementProductCosts> ptlAgreementProductCosts = baseMapper.selectPage(page,getByAgreementIdWrapper(ptlAgreementProductQueryVo.getAgreementId()));
         return ptlAgreementProductCosts;
     }

src/main/java/com/ydtech/modules/protocol/service/impl/TaxSourceServiceImpl.java

@@ -369,8 +369,11 @@ public class TaxSourceServiceImpl extends ServiceImpl<TaxSourceMapper, TaxSource
         }
 
         // 税源
-        TaxSourceDto taxSourceDtos =
-                taxSourceDtoList.stream().filter(x -> x.getIsTaxSource().equals("1")).collect(Collectors.toList()).get(0);
+        List<TaxSourceDto> collect = taxSourceDtoList.stream().filter(x -> x.getIsTaxSource().equals("1")).collect(Collectors.toList());
+        TaxSourceDto taxSourceDtos = null;
+        if(!collect.isEmpty()){
+            taxSourceDtos = collect.get(0);
+        }
 
         if (!isExclude && (Float.parseFloat(volume) >= 1) && (taxSourceDtos != null)) {
             resultId = taxSourceDtos.getAgreementId();

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Table;
 import java.math.BigDecimal;
 
 /**
@@ -33,6 +34,14 @@ public class InsFeeOrderNew {
     @TableField(value = "agreement_id")
     private String agreementId;
 
+    @ApiModelProperty(value = "部门ID")
+    @TableField(value = "dept_id")
+    private String deptId;
+
+    @ApiModelProperty(value = "用户id")
+    @TableField(value = "user_id")
+    private String userId;
+
     @ApiModelProperty(value = "交强险保费")
     @TableField(value = "jq_premium")
     private BigDecimal jqPremium;

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsExport.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Table;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -30,132 +31,132 @@ public class PtlAgreementProductCostsExport {
 
     @ApiModelProperty(value = "交强出口比例一级")
     @TableField(value = "jq_export_radio_level_1")
-    private String jqExportRadioLevel1;
+    private BigDecimal jqExportRadioLevel1;
 
     @ApiModelProperty(value = "交强出口比例二级")
     @TableField(value = "jq_export_radio_level_2")
-    private String jqExportRadioLevel2;
+    private BigDecimal jqExportRadioLevel2;
 
     @ApiModelProperty(value = "交强出口比例三级")
     @TableField(value = "jq_export_radio_level_3")
-    private String jqExportRadioLevel3;
+    private BigDecimal jqExportRadioLevel3;
 
     @ApiModelProperty(value = "交强出口比例四级")
     @TableField(value = "jq_export_radio_level_4")
-    private String jqExportRadioLevel4;
+    private BigDecimal jqExportRadioLevel4;
 
     @ApiModelProperty(value = "交强出口比例五级")
     @TableField(value = "jq_export_radio_level_5")
-    private String jqExportRadioLevel5;
+    private BigDecimal jqExportRadioLevel5;
 
     @ApiModelProperty(value = "交强出口加投比例")
     @TableField(value = "jq_export_investment_radio")
-    private String jqExportInvestmentRadio;
+    private BigDecimal jqExportInvestmentRadio;
 
 
     @ApiModelProperty(value = "商业出口比例一级")
     @TableField(value = "sy_export_radio_level_1")
-    private String syExportRadioLevel1;
+    private BigDecimal syExportRadioLevel1;
 
     @ApiModelProperty(value = "商业出口比例二级")
     @TableField(value = "sy_export_radio_level_2")
-    private String syExportRadioLevel2;
+    private BigDecimal syExportRadioLevel2;
 
     @ApiModelProperty(value = "商业出口比例三级")
     @TableField(value = "sy_export_radio_level_3")
-    private String syExportRadioLevel3;
+    private BigDecimal syExportRadioLevel3;
 
     @ApiModelProperty(value = "商业出口比例四级")
     @TableField(value = "sy_export_radio_level_4")
-    private String syExportRadioLevel4;
+    private BigDecimal syExportRadioLevel4;
 
     @ApiModelProperty(value = "商业出口比例五级")
     @TableField(value = "sy_export_radio_level_5")
-    private String syExportRadioLevel5;
+    private BigDecimal syExportRadioLevel5;
 
     @ApiModelProperty(value = "商业出口加投比例")
     @TableField(value = "sy_export_investment_radio")
-    private String syExportInvestmentRadio;
+    private BigDecimal syExportInvestmentRadio;
 
     @ApiModelProperty(value = "非车出口比例一级")
     @TableField(value = "no_car_export_radio_level_1")
-    private String noCarExportRadioLevel1;
+    private BigDecimal noCarExportRadioLevel1;
 
     @ApiModelProperty(value = "非车出口比例二级")
     @TableField(value = "no_car_export_radio_level_2")
-    private String noCarExportRadioLevel2;
+    private BigDecimal noCarExportRadioLevel2;
 
     @ApiModelProperty(value = "非车出口比例三级")
     @TableField(value = "no_car_export_radio_level_3")
-    private String noCarExportRadioLevel3;
+    private BigDecimal noCarExportRadioLevel3;
 
     @ApiModelProperty(value = "非车出口比例四级")
     @TableField(value = "no_car_export_radio_level_4")
-    private String noCarExportRadioLevel4;
+    private BigDecimal noCarExportRadioLevel4;
 
     @ApiModelProperty(value = "非车出口比例五级")
     @TableField(value = "no_car_export_radio_level_5")
-    private String noCarExportRadioLevel5;
+    private BigDecimal noCarExportRadioLevel5;
 
     @ApiModelProperty(value = "非车出口加投比例")
     @TableField(value = "no_car_export_investment_radio")
-    private String noCarExportInvestmentRadio;
+    private BigDecimal noCarExportInvestmentRadio;
 
 
     public void blank(){
         if(this.jqExportRadioLevel1 == null || this.jqExportRadioLevel1.equals("")){
-            this.jqExportRadioLevel1 = "0";
+            this.jqExportRadioLevel1 = new BigDecimal(0);
         }
         if(this.jqExportRadioLevel2 == null || this.jqExportRadioLevel2.equals("")){
-            this.jqExportRadioLevel2 = "0";
+            this.jqExportRadioLevel2 = new BigDecimal(0);
         }
         if(this.jqExportRadioLevel3 == null || this.jqExportRadioLevel3.equals("")){
-            this.jqExportRadioLevel3 = "0";
+            this.jqExportRadioLevel3 = new BigDecimal(0);
         }
         if(this.jqExportRadioLevel4 == null || this.jqExportRadioLevel4.equals("")){
-            this.jqExportRadioLevel4 = "0";
+            this.jqExportRadioLevel4 = new BigDecimal(0);
         }
         if(this.jqExportRadioLevel5 == null || this.jqExportRadioLevel5.equals("")){
-            this.jqExportRadioLevel5 = "0";
+            this.jqExportRadioLevel5 = new BigDecimal(0);
         }
         if(this.jqExportInvestmentRadio == null || this.jqExportInvestmentRadio.equals("")){
-            this.jqExportInvestmentRadio = "0";
+            this.jqExportInvestmentRadio = new BigDecimal(0);
         }
         if(this.syExportRadioLevel1 == null || this.syExportRadioLevel1.equals("")){
-            this.syExportRadioLevel1 = "0";
+            this.syExportRadioLevel1 = new BigDecimal(0);
         }
         if(this.syExportRadioLevel2 == null || this.syExportRadioLevel2.equals("")){
-            this.syExportRadioLevel2 = "0";
+            this.syExportRadioLevel2 = new BigDecimal(0);
         }
         if(this.syExportRadioLevel3 == null || this.syExportRadioLevel3.equals("")){
-            this.syExportRadioLevel3 = "0";
+            this.syExportRadioLevel3 = new BigDecimal(0);
         }
         if(this.syExportRadioLevel4 == null || this.syExportRadioLevel4.equals("")){
-            this.syExportRadioLevel4 = "0";
+            this.syExportRadioLevel4 = new BigDecimal(0);
         }
         if(this.syExportRadioLevel5 == null || this.syExportRadioLevel5.equals("")){
-            this.syExportRadioLevel5 = "0";
+            this.syExportRadioLevel5 = new BigDecimal(0);
         }
         if(this.syExportInvestmentRadio == null || this.syExportInvestmentRadio.equals("")){
-            this.syExportInvestmentRadio = "0";
+            this.syExportInvestmentRadio = new BigDecimal(0);
         }
         if(this.noCarExportRadioLevel1 == null || this.noCarExportRadioLevel1.equals("")){
-            this.noCarExportRadioLevel1 = "0";
+            this.noCarExportRadioLevel1 = new BigDecimal(0);
         }
         if(this.noCarExportRadioLevel2 == null || this.noCarExportRadioLevel2.equals("")){
-            this.noCarExportRadioLevel2 = "0";
+            this.noCarExportRadioLevel2 = new BigDecimal(0);
         }
         if(this.noCarExportRadioLevel3 == null || this.noCarExportRadioLevel3.equals("")){
-            this.noCarExportRadioLevel3 = "0";
+            this.noCarExportRadioLevel3 = new BigDecimal(0);
         }
         if(this.noCarExportRadioLevel4 == null || this.noCarExportRadioLevel4.equals("")){
-            this.noCarExportRadioLevel4 = "0";
+            this.noCarExportRadioLevel4 = new BigDecimal(0);
         }
         if(this.noCarExportRadioLevel5 == null || this.noCarExportRadioLevel5.equals("")){
-            this.noCarExportRadioLevel5 = "0";
+            this.noCarExportRadioLevel5 = new BigDecimal(0);
         }
         if(this.noCarExportInvestmentRadio == null || this.noCarExportInvestmentRadio.equals("")){
-            this.noCarExportInvestmentRadio = "0";
+            this.noCarExportInvestmentRadio = new BigDecimal(0);
         }
     }
 }

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsNew.java

@@ -171,4 +171,44 @@ public class PtlAgreementProductCostsNew {
     @TableField(exist = false)
     private List<PtlAgreementProductCostsAttrLink> costsAttrLinks;
 
+
+    public void blank() {
+        if (this.jqCarCostsProportion == null || this.jqCarCostsProportion.equals("")) {
+            this.jqCarCostsProportion = "0";
+        }
+        if (this.jqCostsProportion == null || this.jqCostsProportion.equals("")) {
+            this.jqCostsProportion = "0";
+        }
+        if (this.jqCostsProportionAddInvsestment == null || this.jqCostsProportionAddInvsestment.equals("")) {
+            this.jqCostsProportionAddInvsestment = "0";
+        }
+        if (this.jqCarOtherCostsProportion == null || this.jqCarOtherCostsProportion.equals("")) {
+            this.jqCarOtherCostsProportion = "0";
+        }
+
+        if (this.syCarCostsProportion == null || this.syCarCostsProportion.equals("")) {
+            this.syCarCostsProportion = "0";
+        }
+        if (this.syCostsProportion == null || this.syCostsProportion.equals("")) {
+            this.syCostsProportion = "0";
+        }
+        if (this.syCostsProportionAddInvsestment == null || this.syCostsProportionAddInvsestment.equals("")) {
+            this.syCostsProportionAddInvsestment = "0";
+        }
+        if (this.syCarOtherCostsProportion == null || this.syCarOtherCostsProportion.equals("")) {
+            this.syCarOtherCostsProportion = "0";
+        }
+        if (this.noCarCostsProportion == null || this.noCarCostsProportion.equals("")) {
+            this.noCarCostsProportion = "0";
+        }
+
+        if (this.noCostsProportion == null || this.noCostsProportion.equals("")) {
+            this.noCostsProportion = "0";
+        }
+        if (this.noCarOtherCostsProportion == null || this.noCarOtherCostsProportion.equals("")) {
+            this.noCarOtherCostsProportion = "0";
+        }
+
+    }
+
 }

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductCostsSave.java

@@ -145,23 +145,23 @@ public class AgreementProductCostsSave {
      * @return
      */
     public void setExportRadio(PtlAgreementProductCostsExport ptlAgreementProductCostsExport) {
-        this.setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1());
-        this.setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2());
-        this.setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3());
-        this.setJqExportRadioLevel4(ptlAgreementProductCostsExport.getJqExportRadioLevel4());
-        this.setJqExportRadioLevel5(ptlAgreementProductCostsExport.getJqExportRadioLevel5());
-        this.setJqExportInvestmentRadio(ptlAgreementProductCostsExport.getJqExportInvestmentRadio());
-        this.setSyExportRadioLevel1(ptlAgreementProductCostsExport.getSyExportRadioLevel1());
-        this.setSyExportRadioLevel2(ptlAgreementProductCostsExport.getSyExportRadioLevel2());
-        this.setSyExportRadioLevel3(ptlAgreementProductCostsExport.getSyExportRadioLevel3());
-        this.setSyExportRadioLevel4(ptlAgreementProductCostsExport.getSyExportRadioLevel4());
-        this.setSyExportRadioLevel5(ptlAgreementProductCostsExport.getSyExportRadioLevel5());
-        this.setSyExportInvestmentRadio(ptlAgreementProductCostsExport.getSyExportInvestmentRadio());
-        this.setNoCarExportRadioLevel1(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1());
-        this.setNoCarExportRadioLevel2(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2());
-        this.setNoCarExportRadioLevel3(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3());
-        this.setNoCarExportRadioLevel4(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4());
-        this.setNoCarExportRadioLevel5(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
-        this.setNoCarExportInvestmentRadio(ptlAgreementProductCostsExport.getNoCarExportInvestmentRadio());
+        this.setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1().toString());
+        this.setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2().toString());
+        this.setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3().toString());
+        this.setJqExportRadioLevel4(ptlAgreementProductCostsExport.getJqExportRadioLevel4().toString());
+        this.setJqExportRadioLevel5(ptlAgreementProductCostsExport.getJqExportRadioLevel5().toString());
+        this.setJqExportInvestmentRadio(ptlAgreementProductCostsExport.getJqExportInvestmentRadio().toString());
+        this.setSyExportRadioLevel1(ptlAgreementProductCostsExport.getSyExportRadioLevel1().toString());
+        this.setSyExportRadioLevel2(ptlAgreementProductCostsExport.getSyExportRadioLevel2().toString());
+        this.setSyExportRadioLevel3(ptlAgreementProductCostsExport.getSyExportRadioLevel3().toString());
+        this.setSyExportRadioLevel4(ptlAgreementProductCostsExport.getSyExportRadioLevel4().toString());
+        this.setSyExportRadioLevel5(ptlAgreementProductCostsExport.getSyExportRadioLevel5().toString());
+        this.setSyExportInvestmentRadio(ptlAgreementProductCostsExport.getSyExportInvestmentRadio().toString());
+        this.setNoCarExportRadioLevel1(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1().toString());
+        this.setNoCarExportRadioLevel2(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2().toString());
+        this.setNoCarExportRadioLevel3(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3().toString());
+        this.setNoCarExportRadioLevel4(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4().toString());
+        this.setNoCarExportRadioLevel5(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5().toString());
+        this.setNoCarExportInvestmentRadio(ptlAgreementProductCostsExport.getNoCarExportInvestmentRadio().toString());
     }
 }

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -69,23 +69,23 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             int finalI = i;
             PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExports.stream().filter(y -> y.getCostsId().equals(records.get(finalI).getId())).findFirst().orElse(null);
             if(!Objects.isNull(ptlAgreementProductCostsExport)) {
-                records.get(i).setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1());
-                records.get(i).setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2());
-                records.get(i).setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3());
-                records.get(i).setJqExportRadioLevel4(ptlAgreementProductCostsExport.getJqExportRadioLevel4());
-                records.get(i).setJqExportRadioLevel5(ptlAgreementProductCostsExport.getJqExportRadioLevel5());
-                records.get(i).setJqExportInvestmentRadio(ptlAgreementProductCostsExport.getJqExportInvestmentRadio());
-                records.get(i).setSyExportRadioLevel1(ptlAgreementProductCostsExport.getSyExportRadioLevel1());
-                records.get(i).setSyExportRadioLevel2(ptlAgreementProductCostsExport.getSyExportRadioLevel2());
-                records.get(i).setSyExportRadioLevel3(ptlAgreementProductCostsExport.getSyExportRadioLevel3());
-                records.get(i).setSyExportRadioLevel4(ptlAgreementProductCostsExport.getSyExportRadioLevel4());
-                records.get(i).setSyExportRadioLevel5(ptlAgreementProductCostsExport.getSyExportRadioLevel5());
-                records.get(i).setSyExportInvestmentRadio(ptlAgreementProductCostsExport.getSyExportInvestmentRadio());
-                records.get(i).setNoCarExportRadioLevel1(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1());
-                records.get(i).setNoCarExportRadioLevel2(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2());
-                records.get(i).setNoCarExportRadioLevel3(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3());
-                records.get(i).setNoCarExportRadioLevel4(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4());
-                records.get(i).setNoCarExportRadioLevel5(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
+                records.get(i).setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1().toString());
+                records.get(i).setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2().toString());
+                records.get(i).setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3().toString());
+                records.get(i).setJqExportRadioLevel4(ptlAgreementProductCostsExport.getJqExportRadioLevel4().toString());
+                records.get(i).setJqExportRadioLevel5(ptlAgreementProductCostsExport.getJqExportRadioLevel5().toString());
+                records.get(i).setJqExportInvestmentRadio(ptlAgreementProductCostsExport.getJqExportInvestmentRadio().toString());
+                records.get(i).setSyExportRadioLevel1(ptlAgreementProductCostsExport.getSyExportRadioLevel1().toString());
+                records.get(i).setSyExportRadioLevel2(ptlAgreementProductCostsExport.getSyExportRadioLevel2().toString());
+                records.get(i).setSyExportRadioLevel3(ptlAgreementProductCostsExport.getSyExportRadioLevel3().toString());
+                records.get(i).setSyExportRadioLevel4(ptlAgreementProductCostsExport.getSyExportRadioLevel4().toString());
+                records.get(i).setSyExportRadioLevel5(ptlAgreementProductCostsExport.getSyExportRadioLevel5().toString());
+                records.get(i).setSyExportInvestmentRadio(ptlAgreementProductCostsExport.getSyExportInvestmentRadio().toString());
+                records.get(i).setNoCarExportRadioLevel1(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1().toString());
+                records.get(i).setNoCarExportRadioLevel2(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2().toString());
+                records.get(i).setNoCarExportRadioLevel3(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3().toString());
+                records.get(i).setNoCarExportRadioLevel4(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4().toString());
+                records.get(i).setNoCarExportRadioLevel5(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5().toString());
             }
         }
         pages.getRecords().stream().forEach(x -> {
@@ -277,12 +277,15 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //添加费用主表信息
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
+        ptlAgreementProductCostsNew.setId(null);
+        ptlAgreementProductCostsNew.blank();
         int insert = baseMapper.insert(ptlAgreementProductCostsNew);
 
         //添加费用出口信息
         PtlAgreementProductCostsExport ptlAgreementProductCostsExport = new PtlAgreementProductCostsExport();
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsExport);
         ptlAgreementProductCostsExport.setCostsId(ptlAgreementProductCostsNew.getId());
+        ptlAgreementProductCostsExport.setId(null);
         ptlAgreementProductCostsExport.blank();
         ptlAgreementProductCostsExportService.save(ptlAgreementProductCostsExport);
 
@@ -291,7 +294,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
         costsAttrLinks.forEach(x -> {
             //单独处理车牌号
-            if("LicenseNo".equals(x.getAttrCode())){
+            if("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))){
                 x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
                 x.setCostsId(ptlAgreementProductCostsNew.getId());
                 x.setId(0);

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesNewServiceImpl.java

@@ -107,7 +107,8 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
 
     @Override
     public List<PtlAgreementUndwrtRulesNew> rulesList(String agreementId) {
-        List<PtlAgreementUndwrtRulesNew> rulesList = baseMapper.selectList(null);
+        List<PtlAgreementUndwrtRulesNew> rulesList = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreementUndwrtRulesNew>()
+                .eq(PtlAgreementUndwrtRulesNew::getAgreementId, agreementId));
         List<PtlAgreementUndwrtRulesAttrLink> ptlAgreementUndwrtRulesAttrLinkList = ptlAgreementUndwrtRulesAttrLinkService.list();
         rulesList.forEach(item->{
             List<PtlAgreementUndwrtRulesAttrLink> collect = ptlAgreementUndwrtRulesAttrLinkList.stream().filter(x -> Objects.equals(x.getRulesId(), item.getId())).collect(Collectors.toList());

src/main/resources/application-test.yml

@@ -330,7 +330,7 @@ huatai:
 #大家财险api
 dajia:
   api:
-    url: https://ics.djbx.com/sip-agent/simpleRequest/
+    url: https://ics-test.djbx.com/sip-agent/simpleRequest/
     encryptKey: "qwertyuiopasdfgh"
 
 # api url