修改bug：

bug表865，平台应收	跟单费比例都没有显示

commons/src/main/java/com/jzg/commons/entity/finance/dto/ExportSuperviseSettlementDetailExcelDto.java

@@ -69,6 +69,10 @@ public class ExportSuperviseSettlementDetailExcelDto {
     @ExcelProperty(value = "交强手续费比例")
     private String jqSuperviseCostsProportion;
 
+    @Schema(description = "交强跟单费比例")
+    @ExcelProperty(value = "交强跟单费比例")
+    private String jqOtherCostsProportion;
+
     @Schema(description = "商业保单号")
     @ExcelProperty(value = "商业保单号")
     private String syPolicyNo;
@@ -81,6 +85,10 @@ public class ExportSuperviseSettlementDetailExcelDto {
     @ExcelProperty(value = "商业手续费比例")
     private String sySuperviseCostsProportion;
 
+    @Schema(description = "商业跟单费比例")
+    @ExcelProperty(value = "商业跟单费比例")
+    private String syOtherCostsProportion;
+
     @Schema(description = "非车保单号")
     @ExcelProperty(value = "非车保单号")
     private String jyPolicyNo;
@@ -93,6 +101,10 @@ public class ExportSuperviseSettlementDetailExcelDto {
     @ExcelProperty(value = "非车手续费比例")
     private String jySuperviseCostsProportion;
 
+    @Schema(description = "非车跟单费比例")
+    @ExcelProperty(value = "非车跟单费比例")
+    private String jyOtherCostsProportion;
+
     @Schema(description = "车船税")
     @ExcelProperty(value = "车船税")
     private String taxPremium;

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

@@ -59,6 +59,9 @@ public class SettlementQueryVo extends PageRequest {
     @Schema(description = "结算人")
     private String invoicePerson;
 
+    @Schema(description = "对接人")
+    private String contactPerson;
+
     @Schema(description = "结算时间开始")
     private String settlementTimeStart;
 

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

@@ -972,12 +972,15 @@
         COALESCE(ipi.jq_supervise_costs_premiums, 0) + COALESCE(ipi.sy_supervise_costs_premiums, 0) + COALESCE(ipi.jy_supervise_costs_premiums, 0) + COALESCE(ipi.jq_other_costs_premiums, 0) + COALESCE(ipi.sy_other_costs_premiums, 0) + COALESCE(ipi.jy_other_costs_premiums, 0) AS receivableSuperviseCosts,
         ipi.jq_premium as jqPremium,
         ipi.jq_supervise_costs_proportion as jqSuperviseCostsProportion,
+        ipi.jq_other_costs_proportion,
         ipi.jq_policy_no as jqPolicyNo,
         ipi.sy_premium as syPremium,
         ipi.sy_supervise_costs_proportion as sySuperviseCostsProportion,
+        ipi.sy_other_costs_proportion,
         ipi.sy_policy_no as syPolicyNo,
         ipi.jy_premium as jyPremium,
         ipi.jy_supervise_costs_proportion as jySuperviseCostsProportion,
+        ipi.jy_other_costs_proportion,
         ipi.jy_policy_no as jyPolicyNo,
         ipi.tax_premium as taxPremium,
         ipii.create_by as invoicePerson,
@@ -1014,6 +1017,9 @@
             <if test="settlementQueryVo.companyId != null and settlementQueryVo.companyId != ''">
                 AND ipi.company_id = #{settlementQueryVo.companyId}
             </if>
+            <if test="settlementQueryVo.contactPerson != null and settlementQueryVo.contactPerson != ''">
+                AND ipii.contact_person = #{settlementQueryVo.contactPerson}
+            </if>
             <if test="settlementQueryVo.invoiceParty != null and settlementQueryVo.invoiceParty != ''">
                 AND ipii.invoice_party = #{settlementQueryVo.invoiceParty}
             </if>