diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java index 2fb1694f..26a05d58 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java @@ -75,23 +75,27 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl dataArray[0] = String.valueOf((curr - 1) * size + i + 1); dataArray[1] = pageList.get(i).getInvoiceCode(); dataArray[2] = pageList.get(i).getInvoiceNo(); - dataArray[3] = dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus()); - dataArray[4] = pageList.get(i).getInvoiceDate(); - dataArray[5] = pageList.get(i).getGfName(); - dataArray[6] = pageList.get(i).getXfName(); - dataArray[7] = pageList.get(i).getInvoiceAmount(); - dataArray[8] = pageList.get(i).getTaxAmount(); - dataArray[9] = pageList.get(i).getDkTaxAmount(); - dataArray[10] = dictdetaServcice.queryDictName(DictConstant.QS_STATUS, pageList.get(i).getQsStatus()); - dataArray[11] = pageList.get(i).getQsDate(); - dataArray[12] = dictdetaServcice.queryDictName(DictConstant.QS_TYPE, pageList.get(i).getQsType()); - dataArray[13] = pageList.get(i).getQsName(); - dataArray[14] = pageList.get(i).getSnVoucherNumber(); - dataArray[15] = pageList.get(i).getPostingTime(); - dataArray[16] = pageList.get(i).getImageNumber(); - dataArray[17] = pageList.get(i).getAccountPeriod(); - dataArray[18] = pageList.get(i).getBzdh(); - dataArray[19] = pageList.get(i).getCompCode(); + dataArray[3] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType()); + dataArray[4] = dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus()); + dataArray[5] = pageList.get(i).getInvoiceDate(); + dataArray[6] = pageList.get(i).getGfName(); + dataArray[7] = pageList.get(i).getXfName(); + dataArray[8] = pageList.get(i).getInvoiceAmount(); + dataArray[9] = pageList.get(i).getTaxAmount(); + dataArray[10] = pageList.get(i).getDkTaxAmount(); + dataArray[11] = dictdetaServcice.queryDictName(DictConstant.QS_STATUS, pageList.get(i).getQsStatus()); + dataArray[12] = pageList.get(i).getQsDate(); + dataArray[13] = dictdetaServcice.queryDictName(DictConstant.QS_TYPE, pageList.get(i).getQsType()); + if ("0".equals(pageList.get(i).getQsStatus())){ + dataArray[13] = ""; + } + dataArray[14] = pageList.get(i).getQsName(); + dataArray[15] = pageList.get(i).getSnVoucherNumber(); + dataArray[16] = pageList.get(i).getPostingTime(); + dataArray[17] = pageList.get(i).getImageNumber(); + dataArray[18] = pageList.get(i).getAccountPeriod(); + dataArray[19] = pageList.get(i).getBzdh(); + dataArray[20] = pageList.get(i).getCompCode(); returnList.add(dataArray); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java index 600c2f1a..8c618d54 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java @@ -65,8 +65,8 @@ public class ManualAthensThread extends BaseThread { /** * 导出excel的列名 */ - private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票状态", "开票日期","购方名称", "销方名称", "金额", "税额", - "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号","报账单号", "过账时间", "影像号", "账期", "报账单号", "所属组织"}; + private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额", + "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "所属组织"}; /** * 导出excel的列名