修改跟单费用-结算报表，增加保险公司和保险公司支公司

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

@@ -890,22 +890,6 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         // 2. 查询跟单主数据并聚合
         List<FollowCompanyFeeVO> originalFollowList = insFeeFollowOrderMapper.selectFollowCompanySettlementReport(vo);
         log.info("跟单费查询。 vo=[{}],originalFollowList.size=[{}]", JSONUtil.toJsonStr(vo), CollUtil.size(originalFollowList));
-        // 根据保险机构匹配保险公司
-        List<FollowCompanyFeeVO> list = originalFollowList.stream().peek(action -> {
-            String partnerCompanyId = action.getPartnerCompanyId();
-            EsmInsCompany esmInsCompany1 = companyMap.get(partnerCompanyId);
-            if(esmInsCompany1 != null){
-                action.setPartnerCompanySimplyName(esmInsCompany1.getName());
-            }
-            EsmInsCompany esmInsCompany = stringEsmInsCompanyMap.get(partnerCompanyId);
-            if(esmInsCompany != null){
-                action.setCompanyId(esmInsCompany.getId());
-                action.setCompanyName(esmInsCompany.getName());
-            }
-        }).toList();
-
-        originalFollowList =new ArrayList<>(list);
-
         if (CollUtil.isNotEmpty(originalFollowList)) {
             List<FollowCompanyFeeVO> followAggVoList = aggregateFollowData(originalFollowList, companyMap);
             resultList.addAll(followAggVoList);
@@ -924,7 +908,21 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         // 5. 设置signMonth字段
         assignSignMonth(resultList);
 
-        return resultList;
+        // 根据保险机构匹配保险公司
+        List<FollowCompanyFeeVO> list = resultList.stream().peek(action -> {
+            String partnerCompanyId = action.getPartnerCompanyId();
+            EsmInsCompany insCompany = companyMap.get(partnerCompanyId);
+            if(insCompany != null){
+                action.setPartnerCompanySimplyName(insCompany.getName());
+            }
+            EsmInsCompany esmInsCompany = stringEsmInsCompanyMap.get(partnerCompanyId);
+            if(esmInsCompany != null){
+                action.setCompanyId(esmInsCompany.getId());
+                action.setCompanyName(esmInsCompany.getName());
+            }
+        }).toList();
+
+        return list;
     }
 
 
@@ -1140,15 +1138,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             String invoiceType = splitArr[3];
             List<FollowCompanyFeeVO> voList = entry.getValue();
 
-            FollowCompanyFeeVO followCompanyFeeVO = voList.get(0);
             FollowCompanyFeeVO vo = new FollowCompanyFeeVO();
             vo.setPartnerCompanyId(partnerCompanyId);
-            vo.setCompanyName(followCompanyFeeVO.getCompanyName());
-            vo.setCompanyId(followCompanyFeeVO.getCompanyId());
-            vo.setPartnerCompanySimplyName(followCompanyFeeVO.getPartnerCompanySimplyName());
             vo.setYear(year);
             vo.setMonth(month);
             vo.setInvoiceType(invoiceType);
+            vo.setCompanyName(getCompanyName(partnerCompanyId, companyMap));
 
             // 汇总当前分组所有followId、settlementId
             List<String> followIds = voList.stream().map(FollowCompanyFeeVO::getFollowId).distinct().toList();