From d32177b67a61b3f0cf2340d1aa600dc2b01475b8 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 14:56:20 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=BF=9B=E9=A1=B9bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/core/service/export/impl/RzFpxxServiceImpl.java   | 7 +++++++
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml         | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
index 770cf3ee..e2b35002 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
@@ -197,6 +197,13 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         fpVo.setAuthenticationPerson(vo.getAuthenticationPerson());
                         fpVo.setTaxPeriod(vo.getTaxPeriod());
                         fpVo.setBusinessName(vo.getDeptId());
+                        fpVo.setSnVoucherNumber(vo.getSnVoucherNumber());
+                        fpVo.setAccountPeriod(vo.getAccountPeriod());
+                        fpVo.setCompCode(vo.getCompCode());
+                        fpVo.setBzdh(vo.getBzdh());
+                        fpVo.setBzr(vo.getBzr());
+                        fpVo.setPostingTime(vo.getPostingTime().replace("T"," "));
+                        fpVo.setImageNumber(vo.getImageNumber());
                         if("1".equals(vo.getInaccountStatus())){
                             fpVo.setInAccountStatus("已入账");
                         }else{
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 836fd386..780b5797 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -77,8 +77,6 @@
         <result column="gx_user_name" jdbcType="VARCHAR" property="authenticationPerson"/>
         <result column="rzh_belong_date" jdbcType="VARCHAR" property="taxPeriod"/>
         <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
-        <result column="comp_code" jdbcType="VARCHAR" property="deptId"/>
-        <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
         <result column="sn_voucher_number" jdbcType="VARCHAR" property="snVoucherNumber"/>
         <result column="account_period" jdbcType="VARCHAR" property="accountPeriod"/>
         <result column="posting_time" jdbcType="VARCHAR" property="postingTime"/>