From afbb5723e036c189d9cec720230ea0b11c3e64c0 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 20 Apr 2023 20:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E5=92=8C?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7=E7=9A=84=E5=B0=8F=E6=95=B0=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/entity/BaseTDxRecordInvoice.java     |  4 +++-
 .../com/dxhy/base/model/BaseSggxCxRespVO.java | 23 +++++++++++++++++++
 .../BaseInvoiceManualCheckServiceImpl.java    |  5 ++++
 .../main/resources/mapper/BaseFpZhMapper.xml  |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
index 1e2b958f..856c6a67 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
@@ -506,5 +506,7 @@ public class BaseTDxRecordInvoice implements Serializable {
     //账期
     private String accountPeriod;
     //过账时间
-    private Date postingTime;
+    private String postingTime;
+    //影像号
+    private String imageId;
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
index 498aa1ca..b9e2c0cc 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
@@ -1,7 +1,10 @@
 package com.dxhy.base.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 手工勾选查询返回对象
  *
@@ -126,4 +129,24 @@ public class BaseSggxCxRespVO {
      */
     private String eleInvoiceNo;
 
+    /**
+     * 影像id
+     */
+    private String imageId;
+
+    /**
+     * 凭证号
+     */
+    private String snVoucherNumber;
+
+    /**
+     * 过账时间
+     */
+    private String postingTime;
+
+    /**
+     * 过账时间
+     */
+    private String accountPeriod;
+
 }
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 e92d0555..098ea695 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
@@ -14,6 +14,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import com.dxhy.common.constant.DictConstant;
+import com.dxhy.common.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -168,6 +169,10 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
 
                     log.info("businessName={}",businessName);
                     vo.setVoucherNumber(pageList.get(i).getVoucherNumber());
+                    vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber());
+                    vo.setImageId(pageList.get(i).getImageId());
+                    vo.setPostingTime(pageList.get(i).getPostingTime());
+                    vo.setAccountPeriod(pageList.get(i).getAccountPeriod());
                     vo.setId(String.valueOf(pageList.get(i).getId()));
                     vo.setXh(String.valueOf(start + i));
                     vo.setInvoiceAmount(
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 204cc017..2b9f6895 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -53,7 +53,7 @@
             resultMap="BaseResultMap" databaseId="mysql">
         select
         t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no
-        gfsh,t.gf_name
+        gfsh,t.gf_name,t.image_id,t.rzh_date,
         gfmc,t.dept_id deptId,t.dept_name deptName,
         t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d')
         rzh_date,date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id,