From a2220c85eb007e8c5f747191a971e1bcb3bb0788 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 16:11:25 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=BF=9B=E9=A1=B9bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java   | 4 ++--
 .../service/receipt/BaseReceiptInvoiceServiceImpl.java    | 3 ++-
 .../base/service/receipt/BaseReceiptOutServiceImpl.java   | 4 ++--
 .../service/tdxrecordinvoice/BaseFpbrzServiceImpl.java    | 2 +-
 .../main/java/com/dxhy/core/model/CustomsRecordVO.java    | 2 +-
 .../src/main/java/com/dxhy/core/model/CustomsRzcxVO.java  | 4 ++--
 .../java/com/dxhy/core/model/ExportInvoiceRzcxVO.java     | 2 +-
 .../dxhy/core/service/export/impl/FpqsServiceImpl.java    | 4 ++--
 .../dxhy/core/service/export/impl/SgqsServiceImpl.java    | 2 +-
 .../com/dxhy/core/thread/CautionExportAnomalyThread.java  | 3 ++-
 .../java/com/dxhy/core/thread/InvoiceOutExportThread.java | 3 ++-
 .../src/main/resources/mapper/TDxCustomsRecordMapper.xml  | 8 ++++----
 .../src/main/resources/mapper/TDxExportInvoiceDao.xml     | 2 +-
 .../service/caution/ExtCautionExpirationServiceImpl.java  | 2 +-
 .../dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java  | 4 ++--
 15 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index b029fcea..ba61d402 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -181,7 +181,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setVoucherNumber(pageList.get(i).getVoucherNumber());
                     vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber());
                     vo.setImageNumber(pageList.get(i).getImageNumber());
-                    vo.setPostingTime(pageList.get(i).getPostingTime());
+                    vo.setPostingTime(StringUtils.isNotEmpty(pageList.get(i).getPostingTime()) ? pageList.get(i).getPostingTime().replace("T"," ") : "");
                     vo.setAccountPeriod(pageList.get(i).getAccountPeriod());
                     vo.setId(String.valueOf(pageList.get(i).getId()));
                     vo.setXh(String.valueOf(start + i));
@@ -659,7 +659,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         vo.setVoucherNumber(baseTDxRecordInvoice.getVoucherNumber());
         vo.setSnVoucherNumber(baseTDxRecordInvoice.getSnVoucherNumber());
         vo.setImageNumber(baseTDxRecordInvoice.getImageNumber());
-        vo.setPostingTime(baseTDxRecordInvoice.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(baseTDxRecordInvoice.getPostingTime()) ? baseTDxRecordInvoice.getPostingTime().replace("T"," ") : "");
         vo.setAccountPeriod(baseTDxRecordInvoice.getAccountPeriod());
         vo.setId(String.valueOf(baseTDxRecordInvoice.getId()));
         vo.setXh(String.valueOf(count));
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java
index f445a939..4a25b5a5 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.dxhy.common.constant.DictConstant;
 import com.dxhy.common.service.DictdetaServcice;
 import org.springframework.stereotype.Service;
@@ -264,7 +265,7 @@ public class BaseReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxReco
         if (fpxx.getTotalAmount() != null){
             vo.setTotalAmount(AmountFormatUtil.fmtMicrometer(MathUtil.round(fpxx.getTotalAmount().toPlainString())));
         }
-        vo.setPostingTime(fpxx.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(fpxx.getPostingTime()) ? fpxx.getPostingTime().replace("T"," ") : "");
 
         vo.setAccountPeriod(fpxx.getAccountPeriod());
 
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
index 675d2e2d..222b59a5 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
@@ -200,7 +200,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         if (reason != null)
             vo.setReason(reason.getOutReason());
 
-        vo.setPostingTime(record.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(record.getPostingTime()) ? record.getPostingTime().replace("T"," ") : "");
 
         vo.setAccountPeriod(record.getAccountPeriod());
 
@@ -678,7 +678,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
             vo.setCertDate(DateUtils.dateToStr(date));
         }
 
-        vo.setPostingTime(record.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(record.getPostingTime()) ? record.getPostingTime().replace("T"," ") : "");
 
         vo.setAccountPeriod(record.getAccountPeriod());
 
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
index 8fa4595b..5cd5d2e0 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
@@ -218,7 +218,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
         brzvo.setBdkMessage(dictdetaServcice.queryDictName(DictConstant.bdkMessage,tDxRecordInvoice.getBdkMessage()));
         brzvo.setSnVoucherNumber(tDxRecordInvoice.getSnVoucherNumber());
         brzvo.setAccountPeriod(tDxRecordInvoice.getAccountPeriod());
-        brzvo.setPostingTime(tDxRecordInvoice.getPostingTime());
+        brzvo.setPostingTime(StringUtils.isNotEmpty(tDxRecordInvoice.getPostingTime()) ? tDxRecordInvoice.getPostingTime().replace("T"," ") : "");
         brzvo.setImageNumber(tDxRecordInvoice.getImageNumber());
         brzvo.setBzdh(tDxRecordInvoice.getBzdh());
         brzvo.setBzr(tDxRecordInvoice.getBzr());
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java
index a2ccf951..d1c3da63 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java
@@ -40,7 +40,7 @@ public class CustomsRecordVO {
 
     private String snVoucherNumber;
     private String postingTime;
-    private String imageId;
+    private String imageNumber;
     private String accountPeriod;
     private String compCode;
     private String inAccountStatus;
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java
index fb1c927a..6215de01 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java
@@ -33,10 +33,10 @@ public class CustomsRzcxVO {
 
     private String snVoucherNumber;
     private String postingTime;
-    private String imageId;
+    private String imageNumber;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java
index 2a4531a4..a15a7bd3 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java
@@ -34,7 +34,7 @@ public class ExportInvoiceRzcxVO {
 
     private String snVoucherNumber;
     private String postingTime;
-    private String imageId;
+    private String imageNumber;
     private String accountPeriod;
     private String compCode;
     private String inAccountStatus;
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 8d013cdf..c647f49f 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
@@ -155,7 +155,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<TDxRecordInvoiceDao, TDxR
         vo.setRemark(tDxInvoice.getRemark());
         vo.setAccountPeriod(tDxInvoice.getAccountPeriod());
         vo.setImageNumber(tDxInvoice.getImageNumber());
-        vo.setPostingTime(tDxInvoice.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(tDxInvoice.getPostingTime()) ? tDxInvoice.getPostingTime().replace("T"," ") : "");
         vo.setBzdh(tDxInvoice.getBzdh());
         vo.setBzr(tDxInvoice.getBzr());
         vo.setCompCode(tDxInvoice.getCompCode());
@@ -227,7 +227,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<TDxRecordInvoiceDao, TDxR
         vo.setBusinessName(businessName);
         vo.setAccountPeriod(tDxInvoice.getAccountPeriod());
         vo.setImageNumber(tDxInvoice.getImageNumber());
-        vo.setPostingTime(tDxInvoice.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(tDxInvoice.getPostingTime()) ? tDxInvoice.getPostingTime().replace("T"," ") : "");
         vo.setBzdh(tDxInvoice.getBzdh());
         vo.setBzr(tDxInvoice.getBzr());
         vo.setCompCode(tDxInvoice.getCompCode());
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 59ffb686..4bcadaa9 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
@@ -69,7 +69,7 @@ public class SgqsServiceImpl extends MpBaseServiceImpl<SgqsDao, TDxInvoice> impl
                         vo.setInvoiceAmount(MathUtil.round(pageList.get(i).getInvoiceAmount().toPlainString()));
                         vo.setTaxAmount(MathUtil.round(pageList.get(i).getTaxAmount().toPlainString()));
                         vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber());
-                        vo.setPostingTime(pageList.get(i).getPostingTime());
+                        vo.setPostingTime(StringUtils.isNotEmpty(pageList.get(i).getPostingTime()) ? pageList.get(i).getPostingTime().replace("T"," ") : "");
                         vo.setImageNumber(pageList.get(i).getImageNumber());
                         vo.setAccountPeriod(pageList.get(i).getAccountPeriod());
                         vo.setCompCode(pageList.get(i).getCompCode());
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java
index 25eb6d9e..5d91d6ef 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java
@@ -31,6 +31,7 @@ import com.github.pagehelper.PageInfo;
 
 import cn.hutool.core.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author user
@@ -262,7 +263,7 @@ public class CautionExportAnomalyThread extends BaseThread {
 
             vo.setSnVoucherNumber(record.getSnVoucherNumber());
 
-            vo.setPostingTime(record.getPostingTime());
+            vo.setPostingTime(StringUtils.isNotEmpty(record.getPostingTime()) ? record.getPostingTime().replace("T"," ") : "");
 
             vo.setImageNumber(record.getImageId());
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java
index 48554607..fec277e4 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java
@@ -4,6 +4,7 @@ import java.util.*;
 
 import javax.annotation.Resource;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dxhy.common.constant.DbConstant;
@@ -321,7 +322,7 @@ public class InvoiceOutExportThread extends BaseThread {
             vo.setRemark(view.getOutRemark());
 
             vo.setSnVoucherNumber(view.getSnVoucherNumber());
-            vo.setPostingTime(view.getPostingTime());
+            vo.setPostingTime(StringUtils.isNotEmpty(view.getPostingTime()) ? view.getPostingTime().replace("T"," ") : "");
             vo.setImageNumber(view.getImageNumber());
             vo.setAccountPeriod(view.getAccountPeriod());
             vo.setCompCode(view.getCompCode());
diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index 9d4f53c3..d33ddc8d 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -439,11 +439,11 @@
         p.dept_name as businessName,
         p.sn_voucher_number as snVoucherNumber,
         p.posting_time as postingTime,
-        p.image_id as imageId,
+        p.image_id as imageNumber,
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
-        p.inaccount_status as inaccountStatus,
+        p.inaccount_status as inAccountStatus,
         p.comp_code as compCode
         FROM
         t_dx_customs_record p
@@ -1033,7 +1033,7 @@
         t.dept_name as deptName,
         r.sn_voucher_number as snVoucherNumber,
         r.posting_time as postingTime,
-        r.image_id as imageId,
+        r.image_id as imageNumber,
         r.account_period as account_period,
         r.bzdh,
         r.bzr,
@@ -1200,7 +1200,7 @@
         dept_name as deptName,
         sn_voucher_number as snVoucherNumber,
         posting_time as postingTime,
-        image_id as imageId,
+        image_id as imageNumber,
         account_period as account_period,
         bzdh,
         bzr,
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
index 798664f8..a627df16 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
@@ -77,7 +77,7 @@
         p.cxrz_status as cxrzStatus,
         p.sn_voucher_number as snVoucherNumber,
         p.posting_time as postingTime,
-        p.image_id as imageId,
+        p.image_id as imageNumber,
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
index ea0286ec..3c856b6f 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
@@ -270,7 +270,7 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
         // 发票类型
         vo.setInvoiceType(record.getInvoiceType());
 
-        vo.setPostingTime(record.getPostingTime());
+        vo.setPostingTime(StringUtils.isNotEmpty(record.getPostingTime()) ? record.getPostingTime().replace("T"," ") : "");
 
         vo.setAccountPeriod(record.getAccountPeriod());
 
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 0fc08838..5fbb6b93 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
@@ -231,7 +231,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         wqsfp.setTaxAmount(
                 AmountFormatUtil.fmtMicrometer(MathUtil.round(tDxRecordInvoice.getTaxAmount().toPlainString())));
         wqsfp.setAccountPeriod(tDxRecordInvoice.getAccountPeriod());
-        wqsfp.setPostingTime(tDxRecordInvoice.getPostingTime());
+        wqsfp.setPostingTime(StringUtils.isNotEmpty(tDxRecordInvoice.getPostingTime()) ? tDxRecordInvoice.getPostingTime().replace("T"," ") : "");
         wqsfp.setBzdh(tDxRecordInvoice.getBzdh());
         wqsfp.setBzr(tDxRecordInvoice.getBzr());
         wqsfp.setImageNumber(tDxRecordInvoice.getImageNumber());
@@ -1816,7 +1816,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
             qsjg.setGxState(false);
         }
         qsjg.setAccountPeriod(tDxInvoice.getAccountPeriod());
-        qsjg.setPostingTime(tDxInvoice.getPostingTime());
+        qsjg.setPostingTime(StringUtils.isNotEmpty(tDxInvoice.getPostingTime()) ? tDxInvoice.getPostingTime().replace("T"," ") : "");
         qsjg.setBzdh(tDxInvoice.getBzdh());
         qsjg.setBzr(tDxInvoice.getBzr());
         qsjg.setImageNumber(tDxInvoice.getImageNumber());