生成账单费用合并;

mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml

@@ -5,7 +5,7 @@
         select
         <include refid="field_where"></include>
         FROM
-        bms_invoice_list a
+        bms_invoice_list a left join BILL_MANAGE b on a.apply_number = b.apply_number
 
         where a.is_delete = 0
         <include refid="common_where"></include>
@@ -22,6 +22,17 @@
         where a.id = #{id} and a.is_delete = 0
         group by a.id
     </select>
+
+    <select id="getByApplyNumber" parameterType="java.lang.String" resultType="com.mhd.bms.domain.bmsInvoiceList.repository.vo.BmsInvoiceListDetailsVO">
+        select
+        <include refid="field_where2"></include>
+        from
+        bms_invoice_list a
+        LEFT JOIN bms_invoice_info b
+        ON a.invoice_title = b.invoice_title
+        where a.apply_number = #{applyNumber} and a.is_delete = 0
+        group by a.id
+    </select>
     <sql id="common_where">
         <if test="bmsInvoiceListQueryDTO.id !=null and bmsInvoiceListQueryDTO.id != ''"> and a.id = #{bmsInvoiceListQueryDTO.id} </if>
         <if test="bmsInvoiceListQueryDTO.id!=null and bmsInvoiceListQueryDTO.id!=''"> and instr(a.id ,#{bmsInvoiceListQueryDTO.id}) > 0 </if>
@@ -124,6 +135,9 @@
         a.invoice_code,
         a.tracking_number,
         a.apply_number,
+        a.company_name as companyName,
+        b.bill_number as billNumber,
+        b.bill_manage_id as billManageId,
         a.SETTLEMENT_CURRENCY as settlementCurrency,
         a.organization_id AS organizationId,
         a.organization_name AS organizationName,