From 7e8b9812a472a59fdfa740c31f97dbafb7f5e343 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 27 Apr 2023 11:12:38 +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/extend/entity/ExtOtherInvoice.java | 4 +++-
 .../extend/service/pool/ExtInvoicePoolServiceImpl.java    | 4 ++--
 dxhy-extend/src/main/resources/mapper/TicketMapper.xml    | 8 ++++----
 .../dxhy/sign/controller/SignElecInvoiceController.java   | 1 +
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
index f7af08eb..c9ad1d03 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
@@ -2,6 +2,7 @@ package com.dxhy.extend.entity;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -64,7 +65,8 @@ public class ExtOtherInvoice implements Serializable {
     private String taxAmount;
     private String voucherNo;
     private String postingTime;
-    private String imageId;
+    @TableField("image_id")
+    private String imageNumber;
     private String accountPeriod;
     private String inAccountStatus;
     private String bzdh;
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
index 900c50bc..b5f2d37c 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
@@ -218,8 +218,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
                 {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号"
                         , "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态"};
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "invoiceAmount",
-                "qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","voucherNo", "postingTime",
-                    "imageId","accountPeriod","bzdh","inAccountStatus"};
+                "qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","snVoucherNumber", "postingTime",
+                    "imageNumber","accountPeriod","bzdh","inAccountStatus"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);
diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
index a5b7ef80..6323d1c1 100644
--- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
@@ -67,10 +67,10 @@
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
-            t.bzdh = #{bzdh}
+            and t.bzdh = #{bzdh}
         </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
-            t.sn_voucher_number = #{snVoucherNumber}
+            and t.sn_voucher_number = #{snVoucherNumber}
         </if>
     </select>
 
@@ -131,10 +131,10 @@
             and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
-            t.bzdh = #{bzdh}
+            and t.bzdh = #{bzdh}
         </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
-            t.sn_voucher_number = #{snVoucherNumber}
+            and t.sn_voucher_number = #{snVoucherNumber}
         </if>
     </select>
 </mapper>
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java
index f4946192..44dd6b82 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java
@@ -355,6 +355,7 @@ public class SignElecInvoiceController extends AbstractController {
     @RequestMapping("/deleteElec")
     @SysLog("删除签收失败发票")
     public ResponseEntity<R> deleteElec(@RequestBody Map<String, String> pramsMap) {
+        log.info("删除签收失败发票参数{}",pramsMap);
         try {
             // 删除 扫描表信息
             boolean deleteElec = signElecInvoiceService.deleteElec(pramsMap.get("scanId"), getUserInfo().getDbName());