Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

# Conflicts:
#	jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java

jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/InvoiceMapper.java

@@ -120,6 +120,7 @@ public interface InvoiceMapper extends BaseMapper<Invoice> {
      * @return
      */
     public Invoice selectByFpdmFphm(@Param(("companyId")) Long companyId, @Param("fpdm") String fpdm, @Param("fphm") String fphm);
+    public Invoice selectByFphm(@Param("fphm") String fphm);
 
     public Invoice selectInvoiceByBillInfoId(Long id);
 

jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml

@@ -276,6 +276,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.company_id = #{companyId} and a.fpdm = #{fpdm} and a.fphm = #{fphm}
     </select>
 
+    <select id="selectByFphm" resultMap="InvoiceInvoiceDetailResult">
+        select a.id, a.bill_info_id, a.company_id, a.system_orderno, a.out_trade_orderno, a.fpqqlsh, a.invoice_type, a.state, a.c_invoiceid, a.fpdm, a.fphm, a.kprq, a.buyer_name, a.buyer_taxnum, a.buyer_address, a.buyer_telephone, a.buyer_account, a.buyer_email, a.buyer_phone, a.seller_name, a.seller_taxnum, a.seller_address, a.seller_telephone, a.seller_account, a.message, a.clerk, a.payee, a.checker, a.taxfreeamt, a.tax, a.taxamt, a.origin_fpdm, a.origin_fphm, a.jym, a.qr_code, a.machine_code, a.cipher_text, a.invoice_pdf_url, a.invoice_jpg_url,a.invoice_file_storage, a.invoice_msg, a.invoice_result_msg, a.product_oil_flag, a.qdbz, a.c_ofd_url, a.fjh, a.terminal_number,a.deprecate_type,a.deprecate_reason, a.create_by, a.create_time, a.update_by, a.update_time,
+        b.id as sub_id, b.invoice_id as sub_invoice_id, b.index as sub_index, b.good_name as sub_good_name, b.num as sub_num, b.price as sub_price, b.hsbz as sub_hsbz, b.taxrate as sub_taxrate, b.spec as sub_spec, b.unit as sub_unit, b.spbm as sub_spbm, b.bmbbh as sub_bmbbh, b.zsbm as sub_zsbm, b.fphxz as sub_fphxz, b.yhzcbs as sub_yhzcbs, b.zzstsgl as sub_zzstsgl, b.lslbs as sub_lslbs, b.kce as sub_kce, b.taxfreeamt as sub_taxfreeamt, b.tax as sub_tax, b.taxamt as sub_taxamt, b.tspz as sub_tspz, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by
+        from invoice a
+        left join invoice_detail b on b.invoice_id = a.id
+        where a.fphm = #{fphm}
+    </select>
+
     <insert id="insertInvoice" parameterType="Invoice" useGeneratedKeys="true" keyProperty="id">
         insert into invoice
         <trim prefix="(" suffix=")" suffixOverrides=",">