From 73a61f5ba7d039c97c2e559bfcc210d29ba7b758 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 10:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseInvoiceController.java |  2 +-
 .../base/service/fpxxrz/BaseRzFpxxServiceImpl.java  |  2 +-
 .../core/service/export/impl/FpzhcxServiceImpl.java |  2 --
 .../core/service/export/impl/RzFpxxServiceImpl.java |  7 +++++--
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml  | 13 ++++++++-----
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 6e36c958..ba89f674 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -1260,7 +1260,7 @@ public class BaseInvoiceController extends AbstractController {
         if (map == null){
             return ResponseEntity.ok(R.error("缺少请求参数"));
         }
-//        log.info("getUserInfo====>{}",getUserInfo());
+        log.info("getUserInfo====>{}",getUserInfo());
 //        List<String> gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
 //        if (gfshAll ==null || gfshAll.isEmpty()){
 //            return ResponseEntity.ok(R.error("购方信息不能为空"));
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index d8453541..fe444171 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -189,7 +189,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
 //                            pageList.get(i).getInAccountStatus()));
                         if ("1".equals(pageList.get(i).getInAccountStatus())){
                             pageList.get(i).setInAccountStatus("已入账");
-                        }else if ("0".equals(pageList.get(i).getInAccountStatus())){
+                        }else {
                             pageList.get(i).setInAccountStatus("未入账");
                         }
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java
index 582472c5..4ec80193 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java
@@ -110,8 +110,6 @@ public class FpzhcxServiceImpl extends MpBaseServiceImpl<BbfpzhDao, BbfpzhcxResp
                         vo.setInvoiceStatus(
                             dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, vo.getInvoiceStatus()));
                         vo.setRzzt(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzzt()));
-                        vo.setInAccountStatus(
-                            dictdetaServcice.queryDictName(DictConstant.DK_STATUS, vo.getInAccountStatus()));
                         vo.setInvoiceType(
                             dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT, vo.getInvoiceType()));
                         vo.setQszt(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, vo.getQszt()));
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 e6e2c49b..9fd8bfce 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
@@ -227,8 +227,11 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                     for (int i = 0; i < pageList.size(); i++) {
                         pageList.get(i).setXh(String.valueOf((curr - 1) * size + i + 1));
                         // 字典转换
-                        pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
-                                pageList.get(i).getInAccountStatus()));
+                        if ("1".equals(pageList.get(i).getInAccountStatus())){
+                            pageList.get(i).setInAccountStatus("已入账");
+                        }else {
+                            pageList.get(i).setInAccountStatus("未入账");
+                        }
                         pageList.get(i)
                                 .setInvoiceType(new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType()));
                         String invoiceStatus = pageList.get(i).getInvoiceStatus();
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 036406d8..96c3c747 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -32,13 +32,16 @@
         <result column="cxrz_status" property="cxrzStatus"/>
         <result column="bdk_status" property="bdkStatus"/>
         <result column="export_mark" property="exportMark"/>
-        <result column="in_account_status" property="inAccountStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
         <result column="bzdh" property="bzdh"/>
         <result column="bzr" property="bzr"/>
-        <result column="inAccountStatus" property="inAccountStatus"/>
-        <result column="compCode" property="compCode"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="comp_code" property="compCode"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
     </resultMap>
 
     <resultMap id="RzcxhjResultMap"
@@ -87,10 +90,10 @@
         gfmc,t.dept_id deptId,t.dept_name deptName,t.bzdh,t.bzr,
         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,
+        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.in_account_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
         from t_dx_record_invoice t
         WHERE date_format(t.invoice_date,'%Y-%m-%d') 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'))