From 7c129ff9ff2d6a4ce7699ec215d5044f27a2c7f6 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 20 Apr 2023 22:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/base/model/BaseFpRzRespVO.java  |  2 +-
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
index 4ac7dafd..ea4f5d11 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
@@ -204,5 +204,5 @@ public class BaseFpRzRespVO implements Serializable {
     private String imageNumber;
     private String imageId;
 
-    private String rzhDate;
+
 }
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index e24af5e8..2362edf9 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -11,7 +11,12 @@
         <result column="kprq" property="invoiceDate"/>
         <result column="invoice_type" property="invoiceType"/>
         <result column="gfsh" property="gfsh"/>
+        <result column="image_id" property="imageId"/>
+        <result column="image_id" property="imageNumber"/>
         <result column="gfmc" property="gfmc"/>
+        <result column="gf_tax_no" property="gfsh"/>
+        <result column="gf_name" property="gfmc"/>
+        <result column="rzh_date" property="rzsj"/>
         <result column="xf_tax_no" property="xfsh"/>
         <result column="xf_name" property="xfmc"/>
         <result column="invoice_amount" property="invoiceAmount"/>
@@ -52,9 +57,8 @@
     <select id="selectByPramsMap" parameterType="java.util.Map"
             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,t.image_id,t.rzh_date,
-        t.gfmc,t.dept_id deptId,t.dept_name deptName,
+        t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no,t.gf_name,t.image_id,t.rzh_date,
+        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,
         t.gx_user_name,t.rzh_belong_date