From 0bf3dbd6cff3699a304d6a2fea69a7f1cb182e95 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 3 Aug 2023 14:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8D=E6=8A=B5=E6=89=A3?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/model/BaseFpbrzRespVO.java  | 22 +++++++++++++++++++
 .../BaseFpbrzServiceImpl.java                 | 12 ++++++++++
 .../main/resources/mapper/BaseFpbrzMapper.xml | 12 ++++++++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpbrzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpbrzRespVO.java
index ee1133e2..5563229c 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpbrzRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpbrzRespVO.java
@@ -2,6 +2,7 @@ package com.dxhy.base.model;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -141,4 +142,25 @@ public class BaseFpbrzRespVO implements Serializable {
      *不抵扣原因 1-用于非应税项目2-用于免税项目3-用于集体福利或者个人消费4-遭受非正常损失5-其他
      */
     private String bdkMessage;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    @TableField("image_id")
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
+
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
index 7ee79e98..0f048fd0 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
@@ -212,6 +212,18 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
         brzvo.setEleInvoiceNo(tDxRecordInvoice.getEleInvoiceNo());
         brzvo.setBdkYy(tDxRecordInvoice.getBdkYy());
         brzvo.setBdkMessage(dictdetaServcice.queryDictName(DictConstant.bdkMessage,tDxRecordInvoice.getBdkMessage()));
+        brzvo.setSnVoucherNumber(tDxRecordInvoice.getSnVoucherNumber());
+        brzvo.setAccountPeriod(tDxRecordInvoice.getAccountPeriod());
+        brzvo.setPostingTime(tDxRecordInvoice.getPostingTime());
+        brzvo.setImageNumber(tDxRecordInvoice.getImageNumber());
+        brzvo.setBzdh(tDxRecordInvoice.getBzdh());
+        brzvo.setBzr(tDxRecordInvoice.getBzr());
+        brzvo.setCompCode(tDxRecordInvoice.getCompCode());
+        if ("1".equals(tDxRecordInvoice.getInAccountStatus())){
+            brzvo.setInAccountStatus("已入账");
+        }else {
+            brzvo.setInAccountStatus("未入账");
+        }
         return brzvo;
     }
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpbrzMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpbrzMapper.xml
index de68c0c5..23e14e79 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpbrzMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpbrzMapper.xml
@@ -9,7 +9,6 @@
         <result column="invoiceCode" property="invoiceCode"/>
         <result column="invoiceNo" property="invoiceNo"/>
         <result column="invoiceType" property="invoiceType"/>
-
         <result column="gfName" property="gfName"/>
         <result column="gfTaxNo" property="gfTaxNo"/>
         <result column="xfName" property="xfName"/>
@@ -30,6 +29,14 @@
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
         <result column="bdk_yy" property="bdkYy"/>
         <result column="bdk_message" property="bdkMessage"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectByFpbrz" parameterType="java.util.Map"
@@ -39,7 +46,8 @@
         t.xf_name xfName,t.invoice_date invoiceDate,t.invoice_amount invoiceAmount,t.tax_amount taxAmount,t.rzh_yesorno
         rzhYesorno,t.auth_status authStatus,t.dept_name deptName,
         t.qs_status qsStatus,t.qs_date qsDate,t.qs_type qsType,t.invoice_type invoiceType,t.bdk_status
-        bdkStatus,t.cxbdk_status cxbdkStatus,t.qs_name qsName,t.rzh_belong_date,t.ele_invoice_no,t.bdk_yy,t.bdk_message
+        bdkStatus,t.cxbdk_status cxbdkStatus,t.qs_name qsName,t.rzh_belong_date,t.ele_invoice_no,t.bdk_yy,t.bdk_message,
+        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,t_dx_tax_current b
         where t.gf_tax_no = b.taxno and
         t.gf_tax_no in