修改bug：

私有应收-跟单	数据显示不对，诚泰跟单是220.26265，报表显示220

commons/src/main/java/com/jzg/commons/entity/finance/vo/QueryFollowIncomeVo.java

@@ -24,4 +24,7 @@ public class QueryFollowIncomeVo  extends PageRequest implements Serializable {
     @Schema(description = "保险公司id")
     private List<String> companyIdList;
 
+    @Schema(description = "保险公司id")
+    private String companyId;
+
 }

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

@@ -773,8 +773,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 List<InsFeeFollowOrder> insFeeFollowOrders = insFeeFollowOrderMapper.selectList(insFeeFollowOrderLambdaQueryWrapper);
                 // 总金额
                 InsFeeFollowOrder feeFollowOrder = CollUtil.getFirst(insFeeFollowOrders);
-                // 取对账金额
-                BigDecimal receivablePremium = feeFollowOrder.getReconciliationAmount();
+                // 取应收金额
+                BigDecimal receivablePremium = feeFollowOrder.getReceivablePremium();
                 followCompanyFeeVO.setTotalReceivable(receivablePremium);
 
                 BigDecimal totalInvoiced = insFeeFollowOrders.stream().map(InsFeeFollowOrder::getInvoiced).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
@@ -804,7 +804,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
         // 根据incomes的partnerCompanyId + signYear + signMonth，过滤resultList的partnerCompanyId + year + month，根据过滤后的数据进行partnerCompanyId + signYear + signMonth的分组，然后将过滤后剩余的数据，将入到resultList中，
         // 并且设置partnerCompanyId、year、month、totalReceivable为incomes的partnerCompanyId、signYear、signMonth、jq_other_costs_premiums + sy_other_costs_premiums
-        QueryFollowIncomeVo queryFollowIncomeVo = new QueryFollowIncomeVo(null, null, baseController.getSystemCode(), settlementReportQueryVo.getCompanyIdList());
+        QueryFollowIncomeVo queryFollowIncomeVo = new QueryFollowIncomeVo(null, null, baseController.getSystemCode(), null, settlementReportQueryVo.getCompanyId());
         List<InsPlyIncomeDto> incomes = baseMapper.queryFollowIncome(queryFollowIncomeVo);
         if (CollUtil.isNotEmpty(incomes)) {
             // 1. 将resultList现有数据构建 key: partnerCompanyId_year_month 映射，方便快速匹配
@@ -3708,7 +3708,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         String systemCode = baseController.getUserSystemCode();
 
         // 查询该年份下的所有跟进收入数据，并按合作方公司ID进行分组
-        QueryFollowIncomeVo queryFollowIncomeVo = new QueryFollowIncomeVo(startYear, endYear, systemCode, null);
+        QueryFollowIncomeVo queryFollowIncomeVo = new QueryFollowIncomeVo(startYear, endYear, systemCode, null, null);
         List<InsPlyIncomeDto> incomes = baseMapper.queryFollowIncome(queryFollowIncomeVo);
 
         // ====================== 增加动态条件过滤 ======================

tenant/organization/src/main/resources/mapper/InsFeeFollowOrderMapper.xml

@@ -72,6 +72,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="query.companyId != null and query.companyId != ''" >
+                AND ffo.partner_company_id = #{query.companyId}
+            </if>
             -- 跟单订单创建时间范围
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                 AND ffo.create_time BETWEEN #{query.startTime} AND #{query.endTime}

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -2045,6 +2045,9 @@
             <if test="query.systemCode != null">
                 AND a.system_code = #{query.systemCode}
             </if>
+            <if test="query.companyId != null and query.companyId != ''">
+                AND a.company_id = #{query.companyId}
+            </if>
             <if test="query.companyIdList != null and query.companyIdList.size() > 0" >
                 AND a.company_id in
                 <foreach collection="query.companyIdList" item="item" open="(" separator="," close=")">