From 7de4619e78718713fe4f33d5f1579c2b3e3912d8 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 3 Aug 2023 15:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=A8=8E=E2=80=94=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/vo/ManualAuthenticationListVO.java | 20 +++++++++++++++++++ .../DomesticInvoiceDrawbackServiceImpl.java | 5 +++++ .../mapper/DomesticRecordInvoiceMapper.xml | 9 +++++++++ 3 files changed, 34 insertions(+) diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/ManualAuthenticationListVO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/ManualAuthenticationListVO.java index 6c640d7c..3ad77f64 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/ManualAuthenticationListVO.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/ManualAuthenticationListVO.java @@ -2,6 +2,7 @@ package com.dxhy.domestic.model.vo; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -70,4 +71,23 @@ public class ManualAuthenticationListVO implements Serializable { @ApiModelProperty("业务单元名称，根据部门id获取") private String businessName; + //凭证号 + private String snVoucherNumber; + //账期 + private String accountPeriod; + //过账时间 + private String postingTime; + //影像号 + private String imageNumber; + //报账单号 + private String bzdh; + /** + * 组织编码 + */ + private String compCode; + + private String bzr; + + private String inAccountStatus; + } diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java index c8d61c69..11a44534 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java @@ -127,6 +127,11 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba invoice.setSignInStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, invoice.getSignInStatus())); invoice.setInvoiceStatus( dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoice.getInvoiceStatus())); + if ("1".equals(invoice.getInAccountStatus())){ + invoice.setInAccountStatus("已入账"); + }else { + invoice.setInAccountStatus("未入账"); + } }); // 当前页为第一页时统计总税额 if (dto.getCurrentPage() == 1) { diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml index 40ff518c..2b1adeda 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml @@ -1468,6 +1468,14 @@ + + + + + + + + @@ -1624,6 +1632,7 @@ resultMap="authenticationListMap"> select + ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code from t_dx_record_invoice t left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime}