From 2f9031091faffaf11fd14078b5afaa21c87fdd81 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 7 Aug 2023 15:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=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

---
 .../base/model/BaseReceiptInvoiceView.java    | 19 +++++++++
 .../model/BaseReceiptOutCancelRespVO.java     | 19 +++++++++
 .../dxhy/base/model/BaseReceiptOutRespVO.java | 19 +++++++++
 .../BaseReceiptInvoiceServiceImpl.java        | 19 +++++++++
 .../receipt/BaseReceiptOutServiceImpl.java    | 40 +++++++++++++++++++
 .../resources/mapper/BaseInvoiceOutMapper.xml | 10 ++++-
 6 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
index db8d1873..2d3c21e5 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
@@ -119,4 +119,23 @@ public class BaseReceiptInvoiceView implements Serializable {
     private String outBelongDate;
     //转出来源 1 sap
     private String outResource;
+
+    //凭证号
+    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-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java
index 8e87a702..026d13bc 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java
@@ -78,4 +78,23 @@ public class BaseReceiptOutCancelRespVO extends BaseBaseRespVO {
     private String outBelongDate;
     private String outResource;
 
+    //凭证号
+    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-base/src/main/java/com/dxhy/base/model/BaseReceiptOutRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutRespVO.java
index 372a2298..6a0f8fa1 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutRespVO.java
@@ -73,4 +73,23 @@ public class BaseReceiptOutRespVO extends BaseBaseRespVO {
 
     private String outBelongDate;
 
+    //凭证号
+    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-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java
index 04fcb0f5..19b6bb66 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java
@@ -268,6 +268,25 @@ public class BaseReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxReco
         if (fpxx.getTotalAmount() != null){
             vo.setTotalAmount(AmountFormatUtil.fmtMicrometer(MathUtil.round(fpxx.getTotalAmount().toPlainString())));
         }
+        vo.setPostingTime(fpxx.getPostingTime());
+
+        vo.setAccountPeriod(fpxx.getAccountPeriod());
+
+        vo.setBzdh(fpxx.getBzdh());
+
+        vo.setBzr(fpxx.getBzr());
+
+        vo.setSnVoucherNumber(fpxx.getSnVoucherNumber());
+
+        vo.setImageNumber(fpxx.getImageNumber());
+
+        vo.setCompCode(fpxx.getCompCode());
+
+        if ("1".equals(fpxx.getInAccountStatus())){
+            vo.setInAccountStatus("已入账");
+        }else {
+            vo.setInAccountStatus("未入账");
+        }
         return vo;
     }
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
index a2058530..99c2f4b4 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
@@ -204,6 +204,26 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query);
         if (reason != null)
             vo.setReason(reason.getOutReason());
+
+        vo.setPostingTime(record.getPostingTime());
+
+        vo.setAccountPeriod(record.getAccountPeriod());
+
+        vo.setBzdh(record.getBzdh());
+
+        vo.setBzr(record.getBzr());
+
+        vo.setSnVoucherNumber(record.getSnVoucherNumber());
+
+        vo.setImageNumber(record.getImageNumber());
+
+        vo.setCompCode(record.getCompCode());
+
+        if ("1".equals(record.getInAccountStatus())){
+            vo.setInAccountStatus("已入账");
+        }else {
+            vo.setInAccountStatus("未入账");
+        }
         return vo;
     }
 
@@ -667,6 +687,26 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
             date = DateUtils.strToDate(certDate);
             vo.setCertDate(DateUtils.dateToStr(date));
         }
+
+        vo.setPostingTime(record.getPostingTime());
+
+        vo.setAccountPeriod(record.getAccountPeriod());
+
+        vo.setBzdh(record.getBzdh());
+
+        vo.setBzr(record.getBzr());
+
+        vo.setSnVoucherNumber(record.getSnVoucherNumber());
+
+        vo.setImageNumber(record.getImageNumber());
+
+        vo.setCompCode(record.getCompCode());
+
+        if ("1".equals(record.getInAccountStatus())){
+            vo.setInAccountStatus("已入账");
+        }else {
+            vo.setInAccountStatus("未入账");
+        }
         return vo;
     }
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
index cc7ffb04..2df7fda1 100644
--- a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
@@ -27,7 +27,14 @@
         <result column="rzh_date" property="certDate"/>
         <result column="invoice_type" property="invoiceType"/>
         <result column="out_resource" property="outResource"/>
-
+        <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>
 
 
@@ -92,6 +99,7 @@
         <include refid="Base_Column_List"/>
         , b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount
         , b.rzh_date,b.invoice_type,b.out_resource
+        ,b.sn_voucher_number,b.posting_time,b.image_id,b.account_period,b.bzdh,b.bzr,b.inaccount_status,b.comp_code
         FROM t_dx_record_invoice_out a
         LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid
         <where>