From 1df436c9f9f58e87e19157464227f6661f184f79 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 23 May 2023 14:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/export/impl/RzFpxxServiceImpl.java | 14 ++++++++++---- .../com/dxhy/core/thread/ManualAthensThread.java | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) 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 9fd8bfce..5eeee631 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 @@ -71,7 +71,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl List returnList = new ArrayList<>(); if (resultList != null && resultList.size() > 0) { for (int i = 0; i < pageList.size(); i++) { - String[] dataArray = new String[25]; + String[] dataArray = new String[26]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); dataArray[1] = pageList.get(i).getInvoiceCode(); dataArray[2] = pageList.get(i).getInvoiceNo(); @@ -96,9 +96,15 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl dataArray[18] = pageList.get(i).getAccountPeriod(); dataArray[19] = pageList.get(i).getBzdh(); dataArray[20] = pageList.get(i).getBzr(); - dataArray[21] = pageList.get(i).getCompCode(); - dataArray[22] = pageList.get(i).getSuspendStatus(); - dataArray[23] = pageList.get(i).getSuspendDate(); + if ("1".equals(pageList.get(i).getInAccountStatus())){ + dataArray[21] = "已入账"; + }else { + dataArray[21] = "未入账"; + } + + dataArray[22] = pageList.get(i).getCompCode(); + dataArray[23] = pageList.get(i).getSuspendStatus(); + dataArray[24] = pageList.get(i).getSuspendDate(); 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 e4a1cfcb..0aa3686b 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 @@ -66,7 +66,7 @@ public class ManualAthensThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额", - "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","所属组织" + "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","所属组织" ,"暂挂状态","暂挂区间"};