私有应收 结算报表应收手续费没有加非车的手续费

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -5339,30 +5339,29 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         List<CompanySuperviseSettlementReportDto> allCompaniesIncomeDatas = baseMapper.queryCumulativeAccountsReceivable(systemCode, queryVo);
         // 结算状态在上面的sql进行过筛选了，后面就不再筛选了
         queryVo.setStatus(null);
-        if("20".equals(queryVo.getAccountsReceivable())){
-            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action->{
-                // 统计非车的手续费
-                action.setSuperviseFee(action.getSuperviseFee4Other());
-            }).toList();
-        }
-
-        // 车险
-//        if("10".equals(queryVo.getAccountsReceivable())){
-//            // 默认情况下，superviseFee 得到的就是车险的手续费
-//            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().toList();
-//        }else if("20".equals(queryVo.getAccountsReceivable())){
+//        if("20".equals(queryVo.getAccountsReceivable())){
 //            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action->{
 //                // 统计非车的手续费
-//              action.setSuperviseFee(action.getSuperviseFee4Other());
+//                action.setSuperviseFee(action.getSuperviseFee4Other());
 //            }).toList();
-//        }else if(StrUtil.isEmpty(queryVo.getAccountsReceivable())){
-//                // 统计总的手续费
-////            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action->{
-////                // 统计非车的手续费
-////                action.setSuperviseFee(action.getTotalReceivable());
-////            }).toList();
 //        }
 
+        // 车险
+        if("10".equals(queryVo.getAccountsReceivable())){
+            // 默认情况下，superviseFee 得到的就是车险的手续费
+            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().toList();
+        }else if("20".equals(queryVo.getAccountsReceivable())){
+            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action->{
+                // 统计非车的手续费
+              action.setSuperviseFee(action.getSuperviseFee4Other());
+            }).toList();
+        }else if(StrUtil.isEmpty(queryVo.getAccountsReceivable())){
+                // 统计总的手续费(车险+非车险)
+            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().peek(action->{
+                action.setSuperviseFee(BigDecimalUtil.add(action.getSuperviseFee(), action.getSuperviseFee4Other()));
+            }).toList();
+        }
+
         // for test, 查看一家公司的数据，将不可变对象变成 可变对象
 //        allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream().filter(action-> "1738811735599338932".equals(action.getCompanyId())).toList();
 //        allCompaniesIncomeDatas = new ArrayList<>(allCompaniesIncomeDatas);