From 122c5fba5a6e78e60100486463d8ac8e74dd986d Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 31 Aug 2023 15:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=AD=BE=E6=94=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/core/entity/TDxInvoice.java |  2 ++
 .../java/com/dxhy/core/model/FpRzRespVO.java  |  2 ++
 .../java/com/dxhy/core/model/SignQueryVO.java |  3 ++-
 .../service/export/impl/FpqsServiceImpl.java  | 24 +++++++++++++++++++
 .../service/export/impl/SgqsServiceImpl.java  |  8 +++++--
 .../src/main/resources/mapper/FpZhMapper.xml  |  3 ++-
 .../src/main/resources/mapper/QsxxMapper.xml  | 11 ++++++++-
 .../src/main/resources/mapper/SgqsMapper.xml  |  8 +++++++
 8 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java
index 6e382ea4..d20f44db 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java
@@ -195,5 +195,7 @@ public class TDxInvoice implements Serializable {
     private String inaccountStatus;
     private String bzdh;
     private String bzr;
+    private String inAccountStatus;
+    private String imageNumber;
 
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
index 7b4bbfdc..8a380036 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
@@ -229,4 +229,6 @@ public class FpRzRespVO implements Serializable {
     private String suspendStatus;
 
     private String suspendDate;
+
+    private String taxRate;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java
index 8ebcdfad..0d07bf37 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java
@@ -46,5 +46,6 @@ public class SignQueryVO {
     private String inaccountStatus;
     private String bzdh;
     private String bzr;
-
+    private String inAccountStatus;
+    private String imageNumber;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java
index c5abb8e8..8d013cdf 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java
@@ -153,6 +153,18 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<TDxRecordInvoiceDao, TDxR
             ((tDxInvoice.getTotalAmount() == null ? "" : MathUtil.round(tDxInvoice.getTotalAmount().toPlainString()))));
         vo.setCreateDate(tDxInvoice.getCreateDate() != null ? DateUtils.dateToStrLong(tDxInvoice.getCreateDate()) : "");
         vo.setRemark(tDxInvoice.getRemark());
+        vo.setAccountPeriod(tDxInvoice.getAccountPeriod());
+        vo.setImageNumber(tDxInvoice.getImageNumber());
+        vo.setPostingTime(tDxInvoice.getPostingTime());
+        vo.setBzdh(tDxInvoice.getBzdh());
+        vo.setBzr(tDxInvoice.getBzr());
+        vo.setCompCode(tDxInvoice.getCompCode());
+        vo.setSnVoucherNumber(tDxInvoice.getSnVoucherNumber());
+        if ("1".equals(tDxInvoice.getInAccountStatus())){
+            vo.setInAccountStatus("已入账");
+        }else{
+            vo.setInAccountStatus("未入账");
+        }
 
         return vo;
     }
@@ -213,6 +225,18 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<TDxRecordInvoiceDao, TDxR
         vo.setCreateDate(tDxInvoice.getCreateDate() != null ? DateUtils.dateToStrLong(tDxInvoice.getCreateDate()) : "");
         vo.setRemark(tDxInvoice.getRemark());
         vo.setBusinessName(businessName);
+        vo.setAccountPeriod(tDxInvoice.getAccountPeriod());
+        vo.setImageNumber(tDxInvoice.getImageNumber());
+        vo.setPostingTime(tDxInvoice.getPostingTime());
+        vo.setBzdh(tDxInvoice.getBzdh());
+        vo.setBzr(tDxInvoice.getBzr());
+        vo.setCompCode(tDxInvoice.getCompCode());
+        vo.setSnVoucherNumber(tDxInvoice.getSnVoucherNumber());
+        if ("1".equals(tDxInvoice.getInAccountStatus())){
+            vo.setInAccountStatus("已入账");
+        }else{
+            vo.setInAccountStatus("未入账");
+        }
         return vo;
     }
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java
index a57ed4bd..59ffb686 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java
@@ -70,10 +70,14 @@ public class SgqsServiceImpl extends MpBaseServiceImpl<SgqsDao, TDxInvoice> impl
                         vo.setTaxAmount(MathUtil.round(pageList.get(i).getTaxAmount().toPlainString()));
                         vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber());
                         vo.setPostingTime(pageList.get(i).getPostingTime());
-                        vo.setImageId(pageList.get(i).getImageId());
+                        vo.setImageNumber(pageList.get(i).getImageNumber());
                         vo.setAccountPeriod(pageList.get(i).getAccountPeriod());
                         vo.setCompCode(pageList.get(i).getCompCode());
-                        vo.setInaccountStatus(pageList.get(i).getInaccountStatus());
+                        if ("1".equals(pageList.get(i).getInAccountStatus())){
+                            vo.setInAccountStatus("已入账");
+                        }else {
+                            vo.setInAccountStatus("未入账");
+                        }
                         vo.setBzr(pageList.get(i).getBzr());
                         vo.setBzdh(pageList.get(i).getBzdh());
                         returnList.add(vo);
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 67ee217a..159430d3 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -42,6 +42,7 @@
         <result column="image_id" property="imageNumber"/>
         <result column="posting_time" property="postingTime"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="tax_rate" property="taxRate"/>
     </resultMap>
 
     <resultMap id="RzcxhjResultMap"
@@ -93,7 +94,7 @@
         qs_date,t.rzh_type,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,comp_code,
         t.gx_user_name,t.rzh_belong_date
         dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.bdk_status, t.ele_invoice_no,
-        t.export_mark,t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.voucher_number
+        t.export_mark,t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.voucher_number,t.tax_rate
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
diff --git a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
index b7ccad96..a7f9216e 100644
--- a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
@@ -23,6 +23,14 @@
         <result column="xf_name" property="xfName"/>
         <result column="remark" property="remark"/>
         <result column="voucher_number" property="voucherNumber"/>
+        <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="selectQsfpList" parameterType="java.util.Map"
@@ -30,7 +38,8 @@
         SELECT
         t.id,t.notes,t.qs_type,t.gf_name,t.xf_name,t.qs_status,t.qs_date,t.user_name,t.invoice_code,t.invoice_no
         ,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name
-        ,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code
+        ,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number,r.sn_voucher_number,
+        r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code
         from t_dx_invoice t left join t_dx_record_invoice r on t.uuid = r.uuid
         WHERE t.valid = '1'
         <if test="qsNameFlag == null">
diff --git a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
index e885cafb..f8679aa5 100644
--- a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
@@ -18,6 +18,14 @@
         <result column="notes" property="notes"/>
         <result column="dept_id" property="deptId"/>
         <result column="scan_id" property="scanId"/>
+        <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="selectSgqs" parameterType="java.util.Map"