From a23e9fea9ca81a7d6a9ee338c0aa1eb4961a21f4 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 4 Aug 2023 14:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E6=AC=BE=E4=B9=A6=E6=89=8B=E5=B7=A5?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomsSignServiceImpl.java  |  5 ++++
 .../resources/mapper/CustomsRecordMapper.xml  | 10 ++++++-
 .../java/com/dxhy/sign/entity/TDxInvoice.java | 27 +++++++++++++++++++
 .../java/com/dxhy/sign/model/QsjgQueryVO.java | 19 +++++++++++++
 .../fpqs/impl/SignFpqsServiceImpl.java        | 13 ++++++++-
 .../resources/mapper/SignInvoiceMapper.xml    | 10 +++++++
 6 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
index 94d4daf2..8e99ccfa 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
@@ -126,6 +126,11 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
                 if (map.get("fillInDate") != null) {
                     map.put("fillInDate", map.get("fillInDate"));
                 }
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
             }
         }
 
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
index 43eef31c..af527aca 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
@@ -782,7 +782,15 @@
         t.audit_status as auditStatus,
         t.apply_check as applyCheck,
         t.check_status as checkStatus,
-        t.entry_discrepancy as entryDiscrepancy
+        t.entry_discrepancy as entryDiscrepancy,
+        t.sn_voucher_number as snVoucherNumber,
+        t.posting_time as postingTime,
+        t.image_id as imageNumber,
+        t.account_period as accountPeriod,
+        t.bzdh as bzdh,
+        t.bzr as bzr,
+        t.inaccount_status as  inAccountStatus,
+        t.comp_code as compCode
         FROM
         t_dx_customs_record t
         where t.qs_status = '0'
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxInvoice.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxInvoice.java
index 11a29d58..02429c7e 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxInvoice.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxInvoice.java
@@ -206,4 +206,31 @@ public class TDxInvoice implements Serializable {
     private String imagePath;
     private String voucherNumber;
     private String invoiceSource;
+
+    //凭证号
+    @TableField(exist = false)
+    private String snVoucherNumber;
+    //账期
+    @TableField(exist = false)
+    private String accountPeriod;
+    //过账时间
+    @TableField(exist = false)
+    private String postingTime;
+    //影像号
+    @TableField(exist = false)
+    private String imageNumber;
+    //报账单号
+    @TableField(exist = false)
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    @TableField(exist = false)
+    private String compCode;
+
+    @TableField(exist = false)
+    private String bzr;
+
+    @TableField(exist = false)
+    private String inAccountStatus;
 }
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/model/QsjgQueryVO.java b/dxhy-sign/src/main/java/com/dxhy/sign/model/QsjgQueryVO.java
index fb829d3b..2bd21ab8 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/model/QsjgQueryVO.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/model/QsjgQueryVO.java
@@ -126,4 +126,23 @@ public class QsjgQueryVO implements Serializable {
     private Boolean gxState;
 
     private String voucherNumber;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
 }
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index 3f435914..48dcfb89 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -1664,7 +1664,6 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         }
 
         PageHelper.startPage(curr, size);
-        log.info("启动分页插件");
         List<TDxInvoice> pageList = new ArrayList<>();
         if (pramsMap.get("gxStatus") != null && !"".equals(pramsMap.get("gxStatus"))) {
             log.info("gxStatus不为空直接进行查询");
@@ -1812,6 +1811,18 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
             qsjg.setAuthStatus("未勾选");
             qsjg.setGxState(false);
         }
+        qsjg.setAccountPeriod(tDxInvoice.getAccountPeriod());
+        qsjg.setPostingTime(tDxInvoice.getPostingTime());
+        qsjg.setBzdh(tDxInvoice.getBzdh());
+        qsjg.setBzr(tDxInvoice.getBzr());
+        qsjg.setImageNumber(tDxInvoice.getImageNumber());
+        qsjg.setSnVoucherNumber(tDxInvoice.getSnVoucherNumber());
+        qsjg.setCompCode(tDxInvoice.getCompCode());
+        if ("1".equals(tDxInvoice.getInAccountStatus())){
+            qsjg.setInAccountStatus("已入账");
+        }else {
+            qsjg.setInAccountStatus("未入账");
+        }
         return qsjg;
     }
 
diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
index f459e50b..fd73f24f 100644
--- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
@@ -22,6 +22,14 @@
         <result column="create_date" property="createDate"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="image_path" property="imagePath"/>
+        <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>
 
     <resultMap id="BaseResultCountMap" type="com.dxhy.sign.model.QsInvoiceCount">
@@ -35,6 +43,7 @@
         t.id,t.notes,t.qs_type,t.qs_status,t.qs_date,t.user_name,t.invoice_code,t.invoice_no,t.ele_invoice_no,t.uuid,t.invoice_date,t.invoice_type,t.invoice_amount,t.tax_amount
         ,t.dept_id,t.dept_name,t.scan_id,t.gf_name,t.xf_name,t.gf_tax_no,t.xf_tax_no,t.check_code,t.remark,t.create_date,t.total_amount,
         t.voucher_number,img.image_path
+        ,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,r.bzr,r.inaccount_status,r.comp_code
         FROM t_dx_invoice t
         left join t_dx_record_invoice r on t.uuid=r.uuid
         left join t_dx_invoice_img img on t.scan_id = img.scan_id
@@ -555,6 +564,7 @@
         t.settlement_no,
         t.settlement_status,
         r.auth_status,r.voucher_number,img.image_path
+        ,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,r.bzr,r.inaccount_status,r.comp_code
         FROM t_dx_invoice t
         left join t_dx_record_invoice r on t.uuid=r.uuid left join t_dx_invoice_img img on t.scan_id = img.scan_id
         WHERE t.valid = '1'