From 2d65eed99623d58fbb9ef6e8f49a7f9841490acf Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 21 Apr 2023 10:52:03 +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

---
 .../java/com/dxhy/erp/service/SNPushCheckRecordService.java  | 3 ++-
 .../src/main/resources/mapper/ExtInvoicePoolMapper.xml       | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index ea50de86..cadc6110 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -611,7 +611,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             wrapper.eq("uuid", reimburse.getUuid());
             TDxInvoiceReimburse reimburse1 = tDxInvoiceReimburseService.getBaseMapper().selectOne(wrapper);
             if (reimburse1 != null) {
-                insert = tDxInvoiceReimburseService.getBaseMapper().updateById(reimburse);
+//                insert = tDxInvoiceReimburseService.getBaseMapper().updateById(reimburse);
+                insert = tDxInvoiceReimburseService.getBaseMapper().update(reimburse,wrapper);
             } else {
                 insert = tDxInvoiceReimburseService.getBaseMapper().insert(reimburse);
             }
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index d5d251c1..532cedaf 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -160,6 +160,7 @@
         DATE_FORMAT(t.payment_date,'%Y-%m') inAccountMonth,
         t.payment_status inAccountStatus,
         t.voucher_number voucherNo,
+        t.posting_time postingTime,
         t.amortize_status amortizeStatus,
         t.amortize_amount amortizeAmount,
         t.remain_amortize_amount remainAmortizeAmount,
@@ -169,6 +170,8 @@
         t.scan_id scanId,
         t.remark,
         t.document_number documentNumber,
+        t.image_id imageId,
+        t.account_period accountPeriod,
         DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate,
         t.collect_from collectFrom
         from t_dx_record_invoice t
@@ -350,7 +353,7 @@
 <!--        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">-->
 <!--            and t.image_id = #{imageId}-->
 <!--        </if>-->
-        <if test="imageNumber != null and imageNumber != '' and imageId != 'null' and imageNumber != '99'">
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
             and image_id = #{imageNumber}
         </if>
 <!--        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">-->