diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java index 7b55a68d8..7b21bbf2b 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java @@ -191,7 +191,7 @@ public class BmsInvoiceListVO implements Serializable { @ApiModelProperty(value = "账单管理id") private String billManageId; - + private String actualInvoiceCustomerName; public void setTransportationIds(String transportationIds) { this.transportationIds = transportationIds; this.transportationIdsNum = transportationIds.split(",").length; diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml index 9707ed13c..04aece942 100644 --- a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml @@ -55,6 +55,13 @@ and a.remark LIKE CONCAT('%',#{bmsInvoiceListQueryDTO.remark},'%') + + and (SELECT + LISTAGG(ACTUAL_INVOICE_CUSTOMER_NAME, ', ') WITHIN GROUP (ORDER BY ACTUAL_INVOICE_CUSTOMER_NAME) as name + FROM BMS_MAKE_OUT_INVOICE + WHERE + INVOICE_ID = a.id) LIKE CONCAT('%',#{bmsInvoiceListQueryDTO.actualInvoiceCustomerName},'%') + and a.create_by = #{bmsInvoiceListQueryDTO.createBy} @@ -143,6 +150,11 @@ a.organization_id AS organizationId, a.organization_name AS organizationName, a.tax_reg_account AS taxRegAccount, + (SELECT + LISTAGG(ACTUAL_INVOICE_CUSTOMER_NAME, ', ') WITHIN GROUP (ORDER BY ACTUAL_INVOICE_CUSTOMER_NAME) as name + FROM BMS_MAKE_OUT_INVOICE + WHERE + INVOICE_ID = a.id) as actualInvoiceCustomerName, a.top_organization_id AS topOrganizationId