From ffda17a8558d77c68f7cf8a34e9f382a3a4dd240 Mon Sep 17 00:00:00 2001 From: wenhui <1455474577@qq.com> Date: Fri, 18 Mar 2022 16:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=A0=87=E9=A2=98=E5=A4=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java | 3 ++- .../src/main/resources/mapper/XhpcInvoiceMapper.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index fa98070f..d6e7bfe7 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -649,7 +649,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //计算每条要合并发票记录的行的最后一个行号 lastRow = lastRow + invoiceCount; //合并单元格 - for (int columnIndex = 0; columnIndex <= 21; columnIndex++) { + for (int columnIndex = 0; columnIndex <= 22; columnIndex++) { writer.merge(rowStart, lastRow, columnIndex, columnIndex, null, false); } //计算每条要合并发票记录的行的第一个行号 @@ -683,6 +683,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { writer.addHeaderAlias("dutyNumber", "税号"); writer.addHeaderAlias("invoiceContent", "发票内容"); writer.addHeaderAlias("invoiceMoney", "发票总金额"); + writer.addHeaderAlias("invoiceOrderElectricTotalMoney", "总电费金额"); writer.addHeaderAlias("invoiceOrderServiceTotalMoney", "总服务费金额"); writer.addHeaderAlias("firmAddress", "地址"); writer.addHeaderAlias("firmPhone", "电话号码"); diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml index a0156d14..cb4f9091 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml @@ -217,6 +217,7 @@ i.invoice_content as invoiceContent, i.invoice_money as invoiceMoney, i.invoice_order_service_total_money as invoiceOrderServiceTotalMoney, + i.invoice_order_eletric_total_money as invoiceOrderElectricTotalMoney, i.firm_address as firmAddress, i.firm_phone as firmPhone, i.firm_bank as firmBank,