1. 结算调整

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

@@ -2270,9 +2270,19 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                     // 如果比例不相等
                     BigDecimal noOtherCostsProportion = item.getNoOtherCostsProportion();
 
-                    BigDecimal noNoTaxPremium = byBxLicenseno.getNoNoTaxPremium();
+                    BigDecimal noNoTaxPremium = byBxLicenseno.getNoPremium();
 
-                    BigDecimal noOtherAmount = noNoTaxPremium.multiply(item.getNoOtherCostsProportion().divide(new BigDecimal(100)));  //交强跟单费用
+                    BigDecimal divisor = new BigDecimal("1.06"); // 最好是使用字符串来避免精度损失
+
+                    BigDecimal noPremium = noNoTaxPremium.divide(divisor, 5, RoundingMode.HALF_UP);//交强保费 / 1.06
+
+
+                    BigDecimal noOtherAmount = noPremium.multiply(item.getNoOtherCostsProportion().divide(new BigDecimal(100)));  //交强跟单费用
+
+
+                    byBxLicenseno.setNoOtherCostsPremium(noOtherAmount);
+                    byBxLicenseno.setNoOtherCostsProportion(item.getNoOtherCostsProportion());
+                    byBxLicenseno.setAllFeeValue(this.calculateTotal(noOtherAmount,null,null));
 
                     byBxLicenseno.setOtherFeevalue(this.calculateTotal(noOtherAmount,null,null));
                     byBxLicenseno.setOtherFeerate(this.calculateTotal(noOtherCostsProportion,null ,null));

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

@@ -65,6 +65,9 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
             if (StringUtils.isNotEmpty(settlementDocumentaryFeesVo.getParentId())) {
                 params.put("parentId", settlementDocumentaryFeesVo.getParentId());
             }
+            if (StringUtils.isNotEmpty(settlementDocumentaryFeesVo.getSettlementStatus())) {
+                params.put("settlementStatus", settlementDocumentaryFeesVo.getSettlementStatus());
+            }
             PageInfo<List<SettlementDocumentaryFeesEntity>> pageHelper = null;
             List<SettlementDocumentaryFeesEntity> list = this.baseMapper.querySettle(params);
             pageHelper = new PageInfo(list);