Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

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

@@ -49,5 +49,10 @@ public class InvoiceRecordQueryVo extends PageRequest {
      */
     private String invoiceDate;
 
+    /**
+     * 保险公司分支名称
+     */
+    private String companyNameSimple;
+
 
 }

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

@@ -23,6 +23,11 @@ public class InvoiceRecordResult extends PageRequest {
      */
     private String companyName;
 
+    /**
+     * 保险公司分支名称
+     */
+    private String companyNameSimple;
+
     /**
      * 保险公司名称及父级的名称，例如
      */

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

@@ -1092,6 +1092,7 @@
             ipii.update_time,
             ipii.update_by,
             eic.name as company_name,
+            eic.name_simple as companyNameSimple,
             sum( ipiis.actual_received_amount ) AS actual_received_amount,
             ipii.status
         FROM
@@ -1115,6 +1116,9 @@
         <if test="invoiceRecordQueryVo.invoiceParty != null and invoiceRecordQueryVo.invoiceParty != ''">
             AND ipii.invoice_party = #{invoiceRecordQueryVo.invoiceParty}
         </if>
+        <if test="invoiceRecordQueryVo.companyNameSimple != null and invoiceRecordQueryVo.companyNameSimple != ''">
+            AND eic.id = #{invoiceRecordQueryVo.companyNameSimple}
+        </if>
         <if test="invoiceRecordQueryVo.settlementStatus != null and invoiceRecordQueryVo.settlementStatus != ''">
             HAVING CASE
             WHEN ipii.receivable_supervise_premium = SUM(ipiis.actual_received_amount) THEN '1'