平台应收 直接进去批量结算用签单日期筛选出来私有的车的bug修复

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

@@ -45,6 +45,8 @@ public class IncomeDataVO implements Serializable {
     @Schema(description = "对接人手机号")
     private String contactPersonPhone;
 
+    @Schema(description = "协议类型(协议类型 1 平台协议  2 私有协议)")
+    private String agreementType;
 
     /**
      * 类型：1:手续费 2:跟单费 3:驾意手续费 4:驾意跟单费

tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -67,7 +67,8 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
      */
     List<InsPlyIncome> queryIncomeDatasByOrderIds(@Param("orderNos") List<String> orderNos,
                                                   @Param("companyId") String companyId,
-                                                  @Param("invoiceType") String invoiceType);
+                                                  @Param("invoiceType") String invoiceType,
+                                                  @Param("agreementType") String agreementType);
 
     /**
      * 查询应收总额

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

@@ -401,7 +401,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         // add by lipf ,二次过滤查询可开票订单的时候，应该查询未开票的订单
         List<String> orderNos = incomeDataVO.getOrderNos();
         String companyId = incomeDataVO.getCompanyId();
-        List<InsPlyIncome> incomes =  baseMapper.queryIncomeDatasByOrderIds(orderNos,companyId,incomeDataVO.getInvoiceType());
+        if("5".equals(incomeDataVO.getInvoiceType()) || "6".equals(incomeDataVO.getInvoiceType())){
+            incomeDataVO.setAgreementType("1");
+        }
+        List<InsPlyIncome> incomes =  baseMapper.queryIncomeDatasByOrderIds(orderNos,companyId,incomeDataVO.getInvoiceType(),incomeDataVO.getAgreementType());
         log.info("根据订单号和保司id查询出[{}]条记录。 orderNos =[{}],companyId=[{}]",CollUtil.size(incomes), JSONUtil.toJsonStr(orderNos), companyId);
         // 需要查询未结算的数据 modify by lipf 2026年6月4日11:06:50
         incomes = incomes.stream().filter(action->{

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

@@ -238,9 +238,8 @@
     <!--  查询对接人列表 lipf 2026年7月28日09:16:34 -->
     <select id="queryContractVos" resultType="com.jzg.commons.entity.finance.vo.ContractVO">
         select
-        distinct pa.system_code ,
-        pa.docking_person as contactPerson,
-        pa.docking_phone as contactPersonPhone
+            distinct pa.system_code ,
+            pa.docking_person as contactPerson
         from
         ptl_agreement pa
         where

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

@@ -310,6 +310,9 @@
         <if test="companyId != null and companyId != ''">
             AND io.company_id = #{companyId}
         </if>
+        <if test="agreementType != null and agreementType != ''">
+            and ipi.agreement_type = #{agreementType}
+        </if>
         <if test="invoiceType != null and invoiceType != ''">
             AND ipi.id not in (
             select ipiil.income_id from   ins_ply_income_invoice_link	ipiil where  ipiil.invoice_type = #{invoiceType} and ipiil.is_delete  = 0