yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复导出发票标题头问题

Browse Source
This commit is contained in:
wenhui 2022-03-18 16:52:50 +08:00
parent a3f149ac5e
commit ffda17a855
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java
View File

@ -649,7 +649,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
//计算每条要合并发票记录的行的最后一个行号 //计算每条要合并发票记录的行的最后一个行号
lastRow = lastRow + invoiceCount; 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); writer.merge(rowStart, lastRow, columnIndex, columnIndex, null, false);
} }
//计算每条要合并发票记录的行的第一个行号 //计算每条要合并发票记录的行的第一个行号
@ -683,6 +683,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
writer.addHeaderAlias("dutyNumber", "税号"); writer.addHeaderAlias("dutyNumber", "税号");
writer.addHeaderAlias("invoiceContent", "发票内容"); writer.addHeaderAlias("invoiceContent", "发票内容");
writer.addHeaderAlias("invoiceMoney", "发票总金额"); writer.addHeaderAlias("invoiceMoney", "发票总金额");
writer.addHeaderAlias("invoiceOrderElectricTotalMoney", "总电费金额");
writer.addHeaderAlias("invoiceOrderServiceTotalMoney", "总服务费金额"); writer.addHeaderAlias("invoiceOrderServiceTotalMoney", "总服务费金额");
writer.addHeaderAlias("firmAddress", "地址"); writer.addHeaderAlias("firmAddress", "地址");
writer.addHeaderAlias("firmPhone", "电话号码"); writer.addHeaderAlias("firmPhone", "电话号码");

1
xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml
View File

@ -217,6 +217,7 @@
i.invoice_content as invoiceContent, i.invoice_content as invoiceContent,
i.invoice_money as invoiceMoney, i.invoice_money as invoiceMoney,
i.invoice_order_service_total_money as invoiceOrderServiceTotalMoney, i.invoice_order_service_total_money as invoiceOrderServiceTotalMoney,
i.invoice_order_eletric_total_money as invoiceOrderElectricTotalMoney,
i.firm_address as firmAddress, i.firm_address as firmAddress,
i.firm_phone as firmPhone, i.firm_phone as firmPhone,
i.firm_bank as firmBank, i.firm_bank as firmBank,