From 0e1e5740fb5c5f73a2ff9769deb2fa6c48c92777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 8 Dec 2023 17:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInvoiceManualCheckServiceImpl.java | 11 +++++++++ .../resources/mapper/BaseSggxcxMapper.xml | 3 ++- .../export/impl/RzFpxxServiceImpl.java | 24 +++++++++++++------ .../dxhy/core/thread/ManualAthensThread.java | 2 +- .../src/main/resources/mapper/FpZhMapper.xml | 3 ++- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index 91a797c7..b7a03ff0 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -173,6 +173,17 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl + @@ -79,7 +80,7 @@ ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period, case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when true then 1 - else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date, + else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date,t.auth_status, t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no,t.tax_rate from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq 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 e90e8518..0ed8d721 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 @@ -72,7 +72,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[26]; + String[] dataArray = new String[27]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); dataArray[1] = pageList.get(i).getInvoiceCode(); dataArray[2] = pageList.get(i).getInvoiceNo(); @@ -108,16 +108,26 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl }else { dataArray[21] = "未入账"; } + String authStatus = pageList.get(i).getAuthStatus(); + if ("0".equals(authStatus) || "6".equals(authStatus)){ + dataArray[22] = "未认证"; + } + if ("1".equals(authStatus) || "2".equals(authStatus) || "3".equals(authStatus)){ + dataArray[22] = "认证中"; + } + if ("5".equals(authStatus)){ + dataArray[22] = "认证失败"; + } - dataArray[22] = pageList.get(i).getCompCode(); + dataArray[23] = pageList.get(i).getCompCode(); if ("1".equals(pageList.get(i).getSuspendStatus())){ - dataArray[23] = "是"; - dataArray[24] = pageList.get(i).getSuspendDate(); + dataArray[24] = "是"; + dataArray[25] = pageList.get(i).getSuspendDate(); }else { - dataArray[23] = "否"; - dataArray[24] = ""; + dataArray[24] = "否"; + dataArray[25] = ""; } - dataArray[25] = pageList.get(i).getTaxRate(); + dataArray[26] = pageList.get(i).getTaxRate(); 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 a9af7e2f..3c3b4261 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 @@ -67,7 +67,7 @@ public class ManualAthensThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额", - "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","所属组织" + "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","认证状态","所属组织" ,"暂挂状态","暂挂区间","税率"}; diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 1248423f..4a87c1e2 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -540,6 +540,7 @@ +