费用修改bug

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

@@ -255,7 +255,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 BigDecimal sumPremium = insFeeOrderNew.getJqPremium().add(insFeeOrderNew.getSyPremium()).add(insFeeOrderNew.getNoPremium());
                 if (Integer.parseInt(esmRetail.getRetailtype()) >= 3) {
                     insFeeOrderNew.setThirdDetailProportion(new BigDecimal(esmRetail.getDisrate3()));
-                    retailRadio.add(insFeeOrderNew.getThirdDetailProportion());
+                    retailRadio = retailRadio.add(insFeeOrderNew.getThirdDetailProportion());
                     insFeeOrderNew.setThirdDetailPremiums(sumPremium.multiply(new BigDecimal(esmRetail.getDisrate3())).divide(new BigDecimal("100")));
                     if (parents != null && parents.size() > 2) {
                         insFeeOrderNew.setThreeLevelUserId(parents.get(2).getId());
@@ -263,7 +263,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 }
                 if (Integer.parseInt(esmRetail.getRetailtype()) >= 2) {
                     insFeeOrderNew.setSecondDetailProportion(new BigDecimal(esmRetail.getDisrate2()));
-                    retailRadio.add(insFeeOrderNew.getSecondDetailProportion());
+                    retailRadio = retailRadio.add(insFeeOrderNew.getSecondDetailProportion());
                     insFeeOrderNew.setSecondDetailPremiums(sumPremium.multiply(new BigDecimal(esmRetail.getDisrate2())).divide(new BigDecimal("100")));
                     if (parents != null && parents.size() > 1) {
                         insFeeOrderNew.setTwoLevelUserId(parents.get(1).getId());
@@ -271,7 +271,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 }
                 if (Integer.parseInt(esmRetail.getRetailtype()) >= 1) {
                     insFeeOrderNew.setFirstDetailProportion(new BigDecimal(esmRetail.getDisrate1()));
-                    retailRadio.add(insFeeOrderNew.getFirstDetailProportion());
+                    retailRadio = retailRadio.add(insFeeOrderNew.getFirstDetailProportion());
                     insFeeOrderNew.setFirstDetailPremiums(sumPremium.multiply(new BigDecimal(esmRetail.getDisrate1())).divide(new BigDecimal("100")));
                     if (parents != null && parents.size() > 0) {
                         insFeeOrderNew.setFirstLevelUserId(parents.get(0).getId());
@@ -354,7 +354,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
                 insFeeOrderNew.getSyCostsProportion(), syDeptRadio, retailRadio, taxRadio);
 
-        //交强出口手续费比例
+        //非车出口手续费比例
         FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
                 insFeeOrderNew.getNoCostsProportion(), noDeptRadio, retailRadio, taxRadio);
 
@@ -378,10 +378,32 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         //region 重新计算一级机构管理费
         //入口 - 出口 - 机构管理费 2-4级 - 分销费  = 差值  + 一级管理费
 
-        BigDecimal difference = insFeeOrderNew.getJqCostsPremiums().subtract((insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums())))
+        //分销交强费用
+        BigDecimal jqFenXiao = insFeeOrderNew.getJqPremium().multiply(retailRadio.divide(new BigDecimal(100)));
+        //分销商业费用
+        BigDecimal syFenXiao = insFeeOrderNew.getSyPremium().multiply(retailRadio.divide(new BigDecimal(100)));
+        //分销非车费用
+        BigDecimal noFenXiao = insFeeOrderNew.getNoPremium().multiply(retailRadio.divide(new BigDecimal(100)));
+
+        BigDecimal jqDifference = insFeeOrderNew.getJqCostsPremiums().subtract(
+                (insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums())))
                 .subtract(insFeeOrderNew.getJqDeptPremiumsLevel2().add(insFeeOrderNew.getJqDeptPremiumsLevel3()).add(insFeeOrderNew.getJqDeptPremiumsLevel4()).add(insFeeOrderNew.getJqDeptPremiumsLevel5()))
-                        .subtract(insFeeOrderNew.getSecondDetailPremiums().add(insFeeOrderNew.getFirstDetailPremiums()).add(insFeeOrderNew.getThirdDetailPremiums()));
-        insFeeOrderNew.setJqDeptPremiumsLevel1(insFeeOrderNew.getJqDeptPremiumsLevel1().add(difference));
+                .subtract(jqFenXiao);
+        insFeeOrderNew.setJqDeptPremiumsLevel1(jqDifference);
+
+        BigDecimal syDifference = insFeeOrderNew.getSyCostsPremiums().subtract(
+                        (insFeeOrderNew.getSyExportSuperviseCostsPremiums().add(insFeeOrderNew.getSyExportOtherCostsPremiums())))
+                .subtract(insFeeOrderNew.getSyDeptPremiumsLevel2().add(insFeeOrderNew.getSyDeptPremiumsLevel3()).add(insFeeOrderNew.getSyDeptPremiumsLevel4()).add(insFeeOrderNew.getSyDeptPremiumsLevel5()))
+                .subtract(syFenXiao);
+        insFeeOrderNew.setSyDeptPremiumsLevel1(syDifference);
+
+
+        BigDecimal noDifference = insFeeOrderNew.getNoCostsPremiums().subtract(
+                        (insFeeOrderNew.getNoExportSuperviseCostsPremiums().add(insFeeOrderNew.getNoExportOtherCostsPremiums())))
+                .subtract(insFeeOrderNew.getNoDeptPremiumsLevel2().add(insFeeOrderNew.getNoDeptPremiumsLevel3()).add(insFeeOrderNew.getNoDeptPremiumsLevel4()).add(insFeeOrderNew.getNoDeptPremiumsLevel5()))
+                .subtract(noFenXiao);
+
+        insFeeOrderNew.setNoDeptPremiumsLevel1(noDifference);
 
         //endregion
 

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

@@ -86,18 +86,17 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
         //审核条件
-        if (agreementProductQueryVo.getIsAudit() != null){
+        if (agreementProductQueryVo.getIsAudit() != null) {
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
         }
 
         //产品code
-        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()){
+        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()) {
             ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
         //费用时间
-        if (agreementProductQueryVo.getCostStartDate() != null)
-        {
+        if (agreementProductQueryVo.getCostStartDate() != null) {
             ptlAgreementProductCostsNewLambdaQueryWrapper
                     .le(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate());
         }
@@ -107,18 +106,18 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     .ge(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
         }
         //是否有效  1失效  2 有效
-        if(agreementProductQueryVo.getIsEffective() != null){
-            if(agreementProductQueryVo.getIsEffective().equals("1")) {
+        if (agreementProductQueryVo.getIsEffective() != null) {
+            if (agreementProductQueryVo.getIsEffective().equals("1")) {
                 ptlAgreementProductCostsNewLambdaQueryWrapper.gt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
                         .lt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
-            }else if(agreementProductQueryVo.getIsEffective().equals("2")){
+            } else if (agreementProductQueryVo.getIsEffective().equals("2")) {
                 ptlAgreementProductCostsNewLambdaQueryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
                         .gt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
             }
         }
 
         //统配描述
-        if(agreementProductQueryVo.getDesc() != null){
+        if (agreementProductQueryVo.getDesc() != null) {
             ptlAgreementProductCostsNewLambdaQueryWrapper.like(PtlAgreementProductCostsNew::getDesc, agreementProductQueryVo.getDesc());
         }
 
@@ -136,7 +135,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         pages.getRecords().forEach(x -> {
             ids.add(x.getId());
         });
-        if(ids.isEmpty()){
+        if (ids.isEmpty()) {
             return pages;
         }
         //获取出口比例
@@ -149,15 +148,14 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         Map<String, List<PtlAgreementProductCostsAttrLink>> groupedByCostsId = list.stream()
                 .collect(Collectors.groupingBy(PtlAgreementProductCostsAttrLink::getCostsId));
         groupedByCostsId.forEach((k, v) -> {
-            pages.getRecords().stream().filter(x -> x.getId().equals(k)).findFirst().ifPresent(x -> x.setDesc(buildDesc(v,undwrtRulesAttrList)));
+            pages.getRecords().stream().filter(x -> x.getId().equals(k)).findFirst().ifPresent(x -> x.setDesc(buildDesc(v, undwrtRulesAttrList)));
         });
         //赋值出口比例
         List<PtlAgreementProductCostsNew> records = pages.getRecords();
-        for(int i=0;i<records.size();i++)
-        {
+        for (int i = 0; i < records.size(); i++) {
             int finalI = i;
             PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExports.stream().filter(y -> y.getCostsId().equals(records.get(finalI).getId())).findFirst().orElse(null);
-            if(!Objects.isNull(ptlAgreementProductCostsExport)) {
+            if (!Objects.isNull(ptlAgreementProductCostsExport)) {
                 records.get(i).setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1().toString());
                 records.get(i).setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2().toString());
                 records.get(i).setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3().toString());
@@ -188,18 +186,17 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
         //审核条件
-        if(agreementProductQueryVo.getIsAudit() != null){
+        if (agreementProductQueryVo.getIsAudit() != null) {
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
         }
 
         //产品code
-        if(agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()){
+        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()) {
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
         //费用时间
-        if(agreementProductQueryVo.getCostStartDate() != null)
-        {
+        if (agreementProductQueryVo.getCostStartDate() != null) {
             ptlAgreementProductCostsNewLambdaQueryWrapper.or().gt(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate())
                     .lt(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
         }
@@ -213,7 +210,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         pages.forEach(x -> {
             ids.add(x.getId());
         });
-        if(ids.isEmpty()){
+        if (ids.isEmpty()) {
             return pages;
         }
         //获取出口比例
@@ -226,15 +223,14 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         Map<String, List<PtlAgreementProductCostsAttrLink>> groupedByCostsId = list.stream()
                 .collect(Collectors.groupingBy(PtlAgreementProductCostsAttrLink::getCostsId));
         groupedByCostsId.forEach((k, v) -> {
-            pages.stream().filter(x -> x.getId().equals(k)).findFirst().ifPresent(x -> x.setDesc(buildDesc(v,undwrtRulesAttrList)));
+            pages.stream().filter(x -> x.getId().equals(k)).findFirst().ifPresent(x -> x.setDesc(buildDesc(v, undwrtRulesAttrList)));
         });
         //赋值出口比例
         List<PtlAgreementProductCostsNew> records = pages;
-        for(int i=0;i<records.size();i++)
-        {
+        for (int i = 0; i < records.size(); i++) {
             int finalI = i;
             PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExports.stream().filter(y -> y.getCostsId().equals(records.get(finalI).getId())).findFirst().orElse(null);
-            if(!Objects.isNull(ptlAgreementProductCostsExport)) {
+            if (!Objects.isNull(ptlAgreementProductCostsExport)) {
                 records.get(i).setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1().toString());
                 records.get(i).setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2().toString());
                 records.get(i).setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3().toString());
@@ -270,7 +266,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         for (int i = 0; i < v.size(); i++) {
             int finalI = i;
             PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(v.get(finalI).getAttrCode())).findAny().orElse(null);
-            if(ptlAgreementUndwrtRulesAttr != null) {
+            if (ptlAgreementUndwrtRulesAttr != null) {
                 //数值范围判断
                 if ("inputNumber".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
                     desc += inputNumberIdentifying(ptlAgreementUndwrtRulesAttr, v.get(i)) + "\n";
@@ -290,7 +286,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
     }
 
     private String radioIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementProductCostsAttrLink ptlAgreementProductCostsAttrLink) {
-        if(ptlAgreementProductCostsAttrLink.getMin() != null) {
+        if (ptlAgreementProductCostsAttrLink.getMin() != null) {
             PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
                     x.getCode().equals(ptlAgreementProductCostsAttrLink.getMin())).findAny().get();
             return ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + ptlAgreementUndwrtRulesDictLabal.getName();
@@ -464,99 +460,99 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 //            }
 //        }
         try {
-                for (int i = 0; i < agreementProductCosts.getProductId().size(); i++) {
-                    PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
-                    BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
-                    ptlAgreementProductCostsNew.setId(null);
-                    //设置默认优先级为1
-                    if (ptlAgreementProductCostsNew.getPriorityLevel() == null) {
-                        ptlAgreementProductCostsNew.setPriorityLevel(1);
+            for (int i = 0; i < agreementProductCosts.getProductId().size(); i++) {
+                PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
+                BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
+                ptlAgreementProductCostsNew.setId(null);
+                //设置默认优先级为1
+                if (ptlAgreementProductCostsNew.getPriorityLevel() == null) {
+                    ptlAgreementProductCostsNew.setPriorityLevel(1);
+                }
+                ptlAgreementProductCostsNew.setIsAudit(0);
+                ptlAgreementProductCostsNew.setProductId(agreementProductCosts.getProductId().get(i));
+                ptlAgreementProductCostsNew.setProductName(agreementProductCosts.getProductName().get(i));
+                ptlAgreementProductCostsNew.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                ptlAgreementProductCostsNew.setCreateBy(BaseController.getUser().getId());
+                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);
+                //保存产品费用历史记录
+                PtlAgreementProductCostsNewHistory ptlAgreementProductCostsNewHistory = new PtlAgreementProductCostsNewHistory();
+                BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNewHistory);
+                //添加费用ID
+                ptlAgreementProductCostsNewHistory.setId(IdGenerate.nextId());
+                ptlAgreementProductCostsNewHistory.setCostsId(ptlAgreementProductCostsNew.getId());
+                //生成批次ID
+                String uuid = IdGenerate.nextId();
+                ptlAgreementProductCostsNewHistory.setPriorityLevel(ptlAgreementProductCostsNew.getPriorityLevel());
+                ptlAgreementProductCostsNewHistory.setBatch(uuid);
+                ptlAgreementProductCostsNewHistory.setOperatorType("add");
+                ptlAgreementProductCostsNewHistory.setProductId(agreementProductCosts.getProductId().get(i));
+                ptlAgreementProductCostsNewHistory.setProductName(agreementProductCosts.getProductName().get(i));
+                ptlAgreementProductCostsNewHistory.setModifier(BaseController.getUser().getId());
+                ptlAgreementProductCostsNewHistory.setOperatorTime(LocalDateTime.now());
+                ptlAgreementProductCostsNewHistoryService.save(ptlAgreementProductCostsNewHistory);
+                //创建产品费用因子历史记录容器
+                List<PtlAgreementProductCostsAttrLinkHistory> costsAttrLinkHistories = new ArrayList<>();
+                //遍历费用属性
+                List<PtlAgreementProductCostsAttrLink> costsAttrLinks = agreementProductCosts.getCostsAttrLinks();
+                List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
+                List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
+                costsAttrLinks.forEach(x -> {
+                    PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();
+                    //处理中文逗号
+                    if (x.getMin() != null && x.getMin().contains("，")) {
+                        x.setMin(x.getMin().replace("，", ","));
                     }
-                    ptlAgreementProductCostsNew.setIsAudit(0);
-                    ptlAgreementProductCostsNew.setProductId(agreementProductCosts.getProductId().get(i));
-                    ptlAgreementProductCostsNew.setProductName(agreementProductCosts.getProductName().get(i));
-                    ptlAgreementProductCostsNew.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    ptlAgreementProductCostsNew.setCreateBy(BaseController.getUser().getId());
-                    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);
-                    //保存产品费用历史记录
-                    PtlAgreementProductCostsNewHistory ptlAgreementProductCostsNewHistory = new PtlAgreementProductCostsNewHistory();
-                    BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNewHistory);
-                    //添加费用ID
-                    ptlAgreementProductCostsNewHistory.setId(IdGenerate.nextId());
-                    ptlAgreementProductCostsNewHistory.setCostsId(ptlAgreementProductCostsNew.getId());
-                    //生成批次ID
-                    String uuid = IdGenerate.nextId();
-                    ptlAgreementProductCostsNewHistory.setPriorityLevel(ptlAgreementProductCostsNew.getPriorityLevel());
-                    ptlAgreementProductCostsNewHistory.setBatch(uuid);
-                    ptlAgreementProductCostsNewHistory.setOperatorType("add");
-                    ptlAgreementProductCostsNewHistory.setProductId(agreementProductCosts.getProductId().get(i));
-                    ptlAgreementProductCostsNewHistory.setProductName(agreementProductCosts.getProductName().get(i));
-                    ptlAgreementProductCostsNewHistory.setModifier(BaseController.getUser().getId());
-                    ptlAgreementProductCostsNewHistory.setOperatorTime(LocalDateTime.now());
-                    ptlAgreementProductCostsNewHistoryService.save(ptlAgreementProductCostsNewHistory);
-                    //创建产品费用因子历史记录容器
-                    List<PtlAgreementProductCostsAttrLinkHistory> costsAttrLinkHistories = new ArrayList<>();
-                    //遍历费用属性
-                    List<PtlAgreementProductCostsAttrLink> costsAttrLinks = agreementProductCosts.getCostsAttrLinks();
-                    List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
-                    List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
-                    costsAttrLinks.forEach(x -> {
-                        PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();
-                        //处理中文逗号
-                        if (x.getMin() != null && x.getMin().contains("，")) {
-                            x.setMin(x.getMin().replace("，", ","));
-                        }
-                        PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(y -> y.getAttrCode().equals(x.getAttrCode())).findFirst().get();
+                    PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(y -> y.getAttrCode().equals(x.getAttrCode())).findFirst().get();
 
-                        //单独处理车牌号
-                        if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))) {
+                    //单独处理车牌号
+                    if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))) {
 //                x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
-                            x.setOperator("0");
-                            x.setCostsId(ptlAgreementProductCostsNew.getId());
-                            x.setId("0");
-                            costsAttrLink.add(x);
-                            BeanUtils.copyProperties(x, costsAttrLinkHistory);
-                            //设置产品费用因子历史记录
-                            costsAttrLinkHistory.setId(null);
-                            costsAttrLinkHistory.setBatch(uuid);
-                            costsAttrLinkHistory.setOperatorType("add");
-                            costsAttrLinkHistory.setModifier(BaseController.getUser().getId());
-                            costsAttrLinkHistory.setOperatorTime(LocalDateTime.now());
-                            costsAttrLinkHistories.add(costsAttrLinkHistory);
-                        } else {
-                            if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio") || (!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
-                                if (x.getMin() != null || x.getMax() != null) {
-                                    x.setCostsId(ptlAgreementProductCostsNew.getId());
-                                    x.setId("0");
-                                    costsAttrLink.add(x);
-                                    BeanUtils.copyProperties(x, costsAttrLinkHistory);
-                                    //设置产品费用因子历史记录
-                                    costsAttrLinkHistory.setId(null);
-                                    costsAttrLinkHistory.setBatch(uuid);
-
-                                    costsAttrLinkHistory.setOperatorType("add");
-                                    costsAttrLinkHistory.setModifier(BaseController.getUser().getId());
-                                    costsAttrLinkHistory.setOperatorTime(LocalDateTime.now());
-                                    costsAttrLinkHistories.add(costsAttrLinkHistory);
-                                }
+                        x.setOperator("0");
+                        x.setCostsId(ptlAgreementProductCostsNew.getId());
+                        x.setId("0");
+                        costsAttrLink.add(x);
+                        BeanUtils.copyProperties(x, costsAttrLinkHistory);
+                        //设置产品费用因子历史记录
+                        costsAttrLinkHistory.setId(null);
+                        costsAttrLinkHistory.setBatch(uuid);
+                        costsAttrLinkHistory.setOperatorType("add");
+                        costsAttrLinkHistory.setModifier(BaseController.getUser().getId());
+                        costsAttrLinkHistory.setOperatorTime(LocalDateTime.now());
+                        costsAttrLinkHistories.add(costsAttrLinkHistory);
+                    } else {
+                        if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio") || (!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
+                            if (x.getMin() != null || x.getMax() != null) {
+                                x.setCostsId(ptlAgreementProductCostsNew.getId());
+                                x.setId("0");
+                                costsAttrLink.add(x);
+                                BeanUtils.copyProperties(x, costsAttrLinkHistory);
+                                //设置产品费用因子历史记录
+                                costsAttrLinkHistory.setId(null);
+                                costsAttrLinkHistory.setBatch(uuid);
+
+                                costsAttrLinkHistory.setOperatorType("add");
+                                costsAttrLinkHistory.setModifier(BaseController.getUser().getId());
+                                costsAttrLinkHistory.setOperatorTime(LocalDateTime.now());
+                                costsAttrLinkHistories.add(costsAttrLinkHistory);
                             }
                         }
-                    });
-                    //保存产品费用因子历史记录
-                    ptlAgreementProductCostsAttrLinkHistoryService.saveBatch(costsAttrLinkHistories);
-                    ptlAgreementProductCostsAttrLinkService.saveBatch(costsAttrLink);
-                    //添加费用因子轨迹
-                    ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), "新增费用因子", BaseController.getUser().getId());
-                }
+                    }
+                });
+                //保存产品费用因子历史记录
+                ptlAgreementProductCostsAttrLinkHistoryService.saveBatch(costsAttrLinkHistories);
+                ptlAgreementProductCostsAttrLinkService.saveBatch(costsAttrLink);
+                //添加费用因子轨迹
+                ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), "新增费用因子", BaseController.getUser().getId());
+            }
             return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -733,14 +729,13 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
         costsAttrLinks.forEach(x -> {
             //转换数组
-            if(x.getMinArray() != null && x.getMinArray().length > 0){
-                x.setMin(String.join(",",x.getMinArray()));
+            if (x.getMinArray() != null && x.getMinArray().length > 0) {
+                x.setMin(String.join(",", x.getMinArray()));
             }
 
             //处理中文逗号
-            if(x.getMin() != null && x.getMin().contains("，"))
-            {
-                x.setMin(x.getMin().replace("，",","));
+            if (x.getMin() != null && x.getMin().contains("，")) {
+                x.setMin(x.getMin().replace("，", ","));
             }
             //单独处理车牌号
             if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && x.getMin() != "")) {
@@ -801,7 +796,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         ptlAgreementProductCostsAttrLinkHistoryService.saveBatch(costsAttrLinkHistories);
         ptlAgreementProductCostsAttrLinkService.saveBatch(costsAttrLink);
         //添加费用因子轨迹
-        ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),"修改费用因子",BaseController.getUser().getId());
+        ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), "修改费用因子", BaseController.getUser().getId());
         return true;
     }
 
@@ -857,12 +852,13 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         baseMapper.deleteById(costsId);
         ptlAgreementProductCostsAttrLinkService.remove(new LambdaQueryWrapper<PtlAgreementProductCostsAttrLink>().eq(PtlAgreementProductCostsAttrLink::getCostsId, costsId));
         //添加费用因子轨迹
-        ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),"删除费用因子",BaseController.getUser().getId());
+        ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), "删除费用因子", BaseController.getUser().getId());
         return true;
     }
 
     /**
      * 复制协议费用
+     *
      * @param agreementProductCostsCopyVo
      * @return
      */
@@ -894,9 +890,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
     @Transactional
     @Override
-    public boolean costsCopyBatch(AgreementProductCostsCopyVo agreementProductCostsCopyVos){
-        for(int i=0;i<agreementProductCostsCopyVos.getOrgCostsIds().length; i++)
-        {
+    public boolean costsCopyBatch(AgreementProductCostsCopyVo agreementProductCostsCopyVos) {
+        for (int i = 0; i < agreementProductCostsCopyVos.getOrgCostsIds().length; i++) {
             AgreementProductCostsCopyVo agreementProductCostsCopyVo = new AgreementProductCostsCopyVo();
             agreementProductCostsCopyVo.setOrgCostsId(agreementProductCostsCopyVos.getOrgCostsIds()[i]);
             agreementProductCostsCopyVo.setNewAgreementId(agreementProductCostsCopyVos.getNewAgreementId());
@@ -911,9 +906,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
             //设置管理比例信息
             PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, agreementProductCostsCopyVo.getOrgCostsId()));
-            if(ptlAgreementProductCostsExport != null) {
+            if (ptlAgreementProductCostsExport != null) {
                 BeanUtils.copyProperties(ptlAgreementProductCostsExport, agreementProductCosts);
-            }else{
+            } else {
                 ptlAgreementProductCostsExport = new PtlAgreementProductCostsExport();
                 ptlAgreementProductCostsExport.setCostsId(ptlAgreementProductCostsNew.getId());
                 ptlAgreementProductCostsExport.blank();
@@ -932,54 +927,54 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
     }
 
     @Override
-    public boolean costsAudit(CostsAuditVo costsAuditVo){
+    public boolean costsAudit(CostsAuditVo costsAuditVo) {
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = this.getById(costsAuditVo.getCostsId());
-        if(ptlAgreementProductCostsNew == null){
+        if (ptlAgreementProductCostsNew == null) {
             throw new SystemException("费用不存在");
         }
         ptlAgreementProductCostsNew.setIsAudit(costsAuditVo.getIsAudit());
         ptlAgreementProductCostsNew.setAuditPerson(BaseController.getUser().getId());
         ptlAgreementProductCostsNew.setAuditTime(LocalDateTime.now());
         String desc = "";
-        if(costsAuditVo.getIsAudit() == 1) {
+        if (costsAuditVo.getIsAudit() == 1) {
             desc = "审核通过";
-        }else if(costsAuditVo.getIsAudit() == 2){
+        } else if (costsAuditVo.getIsAudit() == 2) {
             desc = "审核驳回";
         }
         //添加费用因子轨迹
-        ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),desc,BaseController.getUser().getId());
+        ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), desc, BaseController.getUser().getId());
         return baseMapper.updateById(ptlAgreementProductCostsNew) > 0 ? true : false;
     }
 
     @Override
     @Transactional
-    public boolean costsAuditBatch(CostsAuditVo costsAuditVo){
-        for (String costsId : costsAuditVo.getCostsIds()){
+    public boolean costsAuditBatch(CostsAuditVo costsAuditVo) {
+        for (String costsId : costsAuditVo.getCostsIds()) {
             PtlAgreementProductCostsNew ptlAgreementProductCostsNew = this.getById(costsId);
-            if(ptlAgreementProductCostsNew == null){
+            if (ptlAgreementProductCostsNew == null) {
                 throw new SystemException("费用不存在");
             }
             ptlAgreementProductCostsNew.setIsAudit(costsAuditVo.getIsAudit());
             ptlAgreementProductCostsNew.setAuditPerson(BaseController.getUser().getId());
             ptlAgreementProductCostsNew.setAuditTime(LocalDateTime.now());
             String desc = "";
-            if(costsAuditVo.getIsAudit() == 1) {
+            if (costsAuditVo.getIsAudit() == 1) {
                 desc = "审核通过";
-            }else if(costsAuditVo.getIsAudit() == 2){
+            } else if (costsAuditVo.getIsAudit() == 2) {
                 desc = "审核驳回";
             }
             //添加费用因子轨迹
-            ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),desc,BaseController.getUser().getId());
+            ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), desc, BaseController.getUser().getId());
             baseMapper.updateById(ptlAgreementProductCostsNew);
         }
         return true;
     }
 
     @Override
-    public boolean costsEndDateBatch(AgreementProductCostsEndDateVo agreementProductCostsEndDateVo){
-        for (String id : agreementProductCostsEndDateVo.getIds()){
+    public boolean costsEndDateBatch(AgreementProductCostsEndDateVo agreementProductCostsEndDateVo) {
+        for (String id : agreementProductCostsEndDateVo.getIds()) {
             PtlAgreementProductCostsNew ptlAgreementProductCostsNew = this.getById(id);
-            if(ptlAgreementProductCostsNew == null){
+            if (ptlAgreementProductCostsNew == null) {
                 throw new SystemException("费用不存在");
             }
             if (agreementProductCostsEndDateVo.getCostsEndDate() != null) {
@@ -990,7 +985,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             }
             String desc = "修改费用因子";
             //添加费用因子轨迹
-            ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),desc,BaseController.getUser().getId());
+            ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), desc, BaseController.getUser().getId());
             //保存产品费用历史记录
             PtlAgreementProductCostsNewHistory ptlAgreementProductCostsNewHistory = new PtlAgreementProductCostsNewHistory();
             //添加费用ID
@@ -1097,7 +1092,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //查询协议是否包含税
         PtlAgreement ptlAgreement = ptlAgreementService.getById(insFeeOrderNew.getAgreementId());
         BigDecimal taxRadio = new BigDecimal("1.00");
-        if(ptlAgreement.getWithTax().equals("否")){
+        if (ptlAgreement.getWithTax().equals("否")) {
             taxRadio = new BigDecimal("1.06");
         }
 
@@ -1112,16 +1107,16 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         FeeOrderNewVo feeOrderNewVoOld = feeOrderNewRecordVo.getFeeOrderNewVoOld();
         FeeOrderNewVo feeOrderNewVo = feeOrderNewRecordVo.getFeeOrderNewVoNew();
 
-        if(feeOrderNewVo.getEntranceFee().get(0).getSuperviseCosts().add(feeOrderNewVo.getEntranceFee().get(0).getOtherCostsProportion()).compareTo(feeOrderNewVo.getEntranceFee().get(0).getTotalProportion()) != 0)
-        {
+        if (feeOrderNewVo.getEntranceFee().get(0).getSuperviseCosts().add(feeOrderNewVo.getEntranceFee().get(0).getOtherCostsProportion())
+                .compareTo(feeOrderNewVo.getEntranceFee().get(0).getTotalProportion()) != 0) {
             throw new SystemException("交强入口费用不匹配,调整费用失败!");
         }
-        if(feeOrderNewVo.getEntranceFee().get(1).getSuperviseCosts().add(feeOrderNewVo.getEntranceFee().get(1).getOtherCostsProportion()).compareTo(feeOrderNewVo.getEntranceFee().get(1).getTotalProportion()) != 0)
-        {
+        if (feeOrderNewVo.getEntranceFee().get(1).getSuperviseCosts().add(feeOrderNewVo.getEntranceFee().get(1).getOtherCostsProportion())
+                .compareTo(feeOrderNewVo.getEntranceFee().get(1).getTotalProportion()) != 0) {
             throw new SystemException("商业入口费用不匹配,调整费用失败!");
         }
-        if(feeOrderNewVo.getEntranceFee().get(2).getSuperviseCosts().add(feeOrderNewVo.getEntranceFee().get(2).getOtherCostsProportion()).compareTo(feeOrderNewVo.getEntranceFee().get(2).getTotalProportion()) != 0)
-        {
+        if (feeOrderNewVo.getEntranceFee().get(2).getSuperviseCosts().add(feeOrderNewVo.getEntranceFee().get(2).getOtherCostsProportion())
+                .compareTo(feeOrderNewVo.getEntranceFee().get(2).getTotalProportion()) != 0) {
             throw new SystemException("非车入口费用不匹配,调整费用失败!");
         }
         //调整后的费用计算
@@ -1166,22 +1161,21 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 feeOrderNewVo.getDeptManagerFee().get(2).getDeptProportionLevelFive());
 
 
-
         BigDecimal jqDeptManagerTotalProportion = jqDeptManagerFee.getDeptProportionLevelOne().add(jqDeptManagerFee.getDeptProportionLevelTwo())
                 .add(jqDeptManagerFee.getDeptProportionLevelThree()).add(jqDeptManagerFee.getDeptProportionLevelFoure())
                 .add(jqDeptManagerFee.getDeptProportionLevelFive());
 
         //交强出口费用
-        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(),insFeeOrderNew.getJqCostsExportProportion(),
-                jqEntranceFee.getTotalProportion(),jqDeptManagerTotalProportion,retailStoreFee.getRetailStoreRadio(),taxRadio);
+        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+                jqEntranceFee.getTotalProportion(), jqDeptManagerTotalProportion, retailStoreFee.getRetailStoreRadio(), taxRadio);
 
         BigDecimal syDeptManagerTotalProportion = syDeptManagerFee.getDeptProportionLevelOne().add(syDeptManagerFee.getDeptProportionLevelTwo())
                 .add(syDeptManagerFee.getDeptProportionLevelThree()).add(syDeptManagerFee.getDeptProportionLevelFoure())
                 .add(syDeptManagerFee.getDeptProportionLevelFive());
 
         //商业出口费用
-        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(),insFeeOrderNew.getSyCostsExportProportion(),
-                syEntranceFee.getTotalProportion(),syDeptManagerTotalProportion,retailStoreFee.getRetailStoreRadio(),taxRadio);
+        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+                syEntranceFee.getTotalProportion(), syDeptManagerTotalProportion, retailStoreFee.getRetailStoreRadio(), taxRadio);
 
 
         BigDecimal noDeptManagerTotalProportion = noDeptManagerFee.getDeptProportionLevelOne().add(noDeptManagerFee.getDeptProportionLevelTwo())
@@ -1189,8 +1183,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 .add(noDeptManagerFee.getDeptProportionLevelFive());
 
         //商业出口费用
-        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(),insFeeOrderNew.getNoCostsExportProportion(),
-                noEntranceFee.getTotalProportion(),noDeptManagerTotalProportion,retailStoreFee.getRetailStoreRadio(),taxRadio);
+        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+                noEntranceFee.getTotalProportion(), noDeptManagerTotalProportion, retailStoreFee.getRetailStoreRadio(), taxRadio);
 
 
         //转换输出的格式
@@ -1201,31 +1195,30 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
 
         FeeOrderNewVo.EntranceFee jqEntranceFeeConv = new FeeOrderNewVo.EntranceFee();
-        BeanUtils.copyProperties(jqEntranceFee,jqEntranceFeeConv);
+        BeanUtils.copyProperties(jqEntranceFee, jqEntranceFeeConv);
         entranceFeeList.add(jqEntranceFeeConv);
 
         FeeOrderNewVo.EntranceFee syEntranceFeeConv = new FeeOrderNewVo.EntranceFee();
-        BeanUtils.copyProperties(syEntranceFee,syEntranceFeeConv);
+        BeanUtils.copyProperties(syEntranceFee, syEntranceFeeConv);
         entranceFeeList.add(syEntranceFeeConv);
 
         FeeOrderNewVo.EntranceFee noEntranceFeeConv = new FeeOrderNewVo.EntranceFee();
-        BeanUtils.copyProperties(noEntranceFee,noEntranceFeeConv);
+        BeanUtils.copyProperties(noEntranceFee, noEntranceFeeConv);
         entranceFeeList.add(noEntranceFeeConv);
 
         resultFeeOrderNewVo.setEntranceFee(entranceFeeList);
 
 
-
         FeeOrderNewVo.DeptManagerFee jqDeptManagerFeeConv = new FeeOrderNewVo.DeptManagerFee();
-        BeanUtils.copyProperties(jqDeptManagerFee,jqDeptManagerFeeConv);
+        BeanUtils.copyProperties(jqDeptManagerFee, jqDeptManagerFeeConv);
         deptManagerFeeList.add(jqDeptManagerFeeConv);
 
         FeeOrderNewVo.DeptManagerFee syDeptManagerFeeConv = new FeeOrderNewVo.DeptManagerFee();
-        BeanUtils.copyProperties(syDeptManagerFee,syDeptManagerFeeConv);
+        BeanUtils.copyProperties(syDeptManagerFee, syDeptManagerFeeConv);
         deptManagerFeeList.add(syDeptManagerFeeConv);
 
         FeeOrderNewVo.DeptManagerFee noDeptManagerFeeConv = new FeeOrderNewVo.DeptManagerFee();
-        BeanUtils.copyProperties(noDeptManagerFee,noDeptManagerFeeConv);
+        BeanUtils.copyProperties(noDeptManagerFee, noDeptManagerFeeConv);
         deptManagerFeeList.add(noDeptManagerFeeConv);
 
         resultFeeOrderNewVo.setDeptManagerFee(deptManagerFeeList);
@@ -1233,17 +1226,17 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         feeOrderNewVo.getExportFee().clear();
 
         FeeOrderNewVo.ExportFee jqExportFeeConv = new FeeOrderNewVo.ExportFee();
-        BeanUtils.copyProperties(jqExportFee,jqExportFeeConv);
+        BeanUtils.copyProperties(jqExportFee, jqExportFeeConv);
         jqExportFeeConv.setInsuranceType("交强险");
         feeOrderNewVo.getExportFee().add(jqExportFeeConv);
 
         FeeOrderNewVo.ExportFee syExportFeeConv = new FeeOrderNewVo.ExportFee();
-        BeanUtils.copyProperties(syExportFee,syExportFeeConv);
+        BeanUtils.copyProperties(syExportFee, syExportFeeConv);
         syExportFeeConv.setInsuranceType("商业险");
         feeOrderNewVo.getExportFee().add(syExportFeeConv);
 
         FeeOrderNewVo.ExportFee noExportFeeConv = new FeeOrderNewVo.ExportFee();
-        BeanUtils.copyProperties(noExportFee,noExportFeeConv);
+        BeanUtils.copyProperties(noExportFee, noExportFeeConv);
         noExportFeeConv.setInsuranceType("非车险");
         feeOrderNewVo.getExportFee().add(noExportFeeConv);
 
@@ -1295,7 +1288,6 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         record.setJqDeptProportionLevel5(feeOrderNewVo.getDeptManagerFee().get(0).getDeptProportionLevelFive());
 
 
-
         //机构管理费 （商业)
         //old
         record.setSyDeptProportionLevel1Old(feeOrderNewVoOld.getDeptManagerFee().get(1).getDeptProportionLevelOne());
@@ -1415,7 +1407,6 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         feeOrderNewVo.getDeptManagerFee().get(2).setDeptPremiumsLevelFive(noDeptManagerFee.getDeptPremiumsLevelFive());
 
 
-
         //处理交强一级机构管理费
         feeOrderNewVo.getDeptManagerFee().get(0).setDeptPremiumsLevelOne(feeOrderNewVo.getEntranceFee().get(0).getTotalAmount().subtract(
                 feeOrderNewVo.getExportFee().get(0).getTotalAmount().add(feeOrderNewVo.getDeptManagerFee().get(0).getDeptPremiumsLevelTwo())
@@ -1454,18 +1445,18 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
     }
 
 
-    public Page<PtlAgreementProductCostsNew> getCostsAuditList(Page page, AgreementProductQueryVo agreementProductQueryVo){
+    public Page<PtlAgreementProductCostsNew> getCostsAuditList(Page page, AgreementProductQueryVo agreementProductQueryVo) {
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //        ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
 
 
         //保险公司id
-        if(agreementProductQueryVo.getCompanyId() != null){
+        if (agreementProductQueryVo.getCompanyId() != null) {
             LambdaQueryWrapper<PtlAgreement> eq = new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getInsuranceCompanyId, agreementProductQueryVo.getCompanyId());
             List<PtlAgreement> list = ptlAgreementService.list(eq);
             List<String> agreementIds = list.stream().map(PtlAgreement::getId).collect(Collectors.toList());
             ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getAgreementId, agreementIds);
-            agreementProductQueryVo.setAgreementIds(String.join(",",agreementIds));
+            agreementProductQueryVo.setAgreementIds(String.join(",", agreementIds));
         }
 
         Page<PtlAgreementProductCostsNew> pages = baseMapper.getCostsPage(page, agreementProductQueryVo);
@@ -1475,7 +1466,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         pages.getRecords().forEach(x -> {
             ids.add(x.getId());
         });
-        if(ids.isEmpty()){
+        if (ids.isEmpty()) {
             return pages;
         }
         //获取出口比例
@@ -1488,15 +1479,14 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         Map<String, List<PtlAgreementProductCostsAttrLink>> groupedByCostsId = list.stream()
                 .collect(Collectors.groupingBy(PtlAgreementProductCostsAttrLink::getCostsId));
         groupedByCostsId.forEach((k, v) -> {
-            pages.getRecords().stream().filter(x -> x.getId().equals(k)).findFirst().ifPresent(x -> x.setDesc(buildDesc(v,undwrtRulesAttrList)));
+            pages.getRecords().stream().filter(x -> x.getId().equals(k)).findFirst().ifPresent(x -> x.setDesc(buildDesc(v, undwrtRulesAttrList)));
         });
         //赋值出口比例
         List<PtlAgreementProductCostsNew> records = pages.getRecords();
-        for(int i=0;i<records.size();i++)
-        {
+        for (int i = 0; i < records.size(); i++) {
             int finalI = i;
             PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExports.stream().filter(y -> y.getCostsId().equals(records.get(finalI).getId())).findFirst().orElse(null);
-            if(!Objects.isNull(ptlAgreementProductCostsExport)) {
+            if (!Objects.isNull(ptlAgreementProductCostsExport)) {
                 records.get(i).setJqExportRadioLevel1(ptlAgreementProductCostsExport.getJqExportRadioLevel1().toString());
                 records.get(i).setJqExportRadioLevel2(ptlAgreementProductCostsExport.getJqExportRadioLevel2().toString());
                 records.get(i).setJqExportRadioLevel3(ptlAgreementProductCostsExport.getJqExportRadioLevel3().toString());

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

@@ -258,6 +258,7 @@
         <if test="params.payStartDateStr != null and params.payStartDateStr != '' and params.payEndDateStr != null and params.payEndDateStr != ''">
             and  DATE_FORMAT(iac.pay_date, '%Y-%m-%d') between #{params.payStartDateStr} AND #{params.payEndDateStr}
         </if>
+        order by iac.createtime desc
     </select>
 
     <select id="getByUserId" resultType="com.ydtech.modules.order.entity.InsOrders">