From 31c7a55ce1e04ded5eafd66ab3d33c58bab185dd Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 17:17:17 +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

---
 .../ckzrz/impl/DomesticExportCustomsCkServiceImpl.java | 10 ++++------
 .../ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java |  2 ++
 .../sign/service/fpqs/impl/SignFpqsServiceImpl.java    |  5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
index e48d1d0c..c35809ae 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
@@ -562,12 +562,10 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (map.get("rzhDate") != null) {
                     map.put("rzhDate", map.get("rzhDate"));
                 }
-                if (map.get("postingTme") != null) {
-                    DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                    LocalDateTime ldt = LocalDateTime.parse(map.get("postingTme").toString());
-                    String postingTme = ldt.format(dtf);
-                    log.info("postingTme={}",postingTme);
-                    map.put("postingTme", postingTme);
+                if (map.get("postingTme") != null && map.get("postingTme").toString() != null && StringUtils.isNotEmpty(map.get("postingTme").toString())) {
+                    String postingTime = map.get("postingTme").toString().replace("T"," ");
+                    log.info("postingTme={}",postingTime);
+                    map.put("postingTme", postingTime);
                 }
 
                 // 字典值转换
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
index 13ddb0f4..8d1580ea 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
@@ -530,6 +530,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 String rzhYesorno = (String)map.get("rzhYesorno");
                 String invoiceStatus = (String)map.get("invoiceStatus");
                 String authStatus = (String)map.get("authStatus");
+                String postingTime = (String)map.get("postingTime");
 
                 map.put("xh",
                     String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
@@ -546,6 +547,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
+                map.put("postingTime", StringUtils.isNotEmpty(postingTime) ? postingTime.replace("T"," ") : "");
 
                 if ("1".equals(map.get("inAccountStatus"))){
                     map.put("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 5fbb6b93..224c2d4e 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
@@ -3465,6 +3465,11 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                 if(resultList.get(i) != null && resultList.get(i).getInvoiceAmount() != null) {
                     qsExcelEntity.setInvoiceAmount(AmountFormatUtil.fmtMicrometer(MathUtil.round(resultList.get(i).getInvoiceAmount().toPlainString())));
                 }
+                if("1".equals(qsExcelEntity.getInAccountStatus())){
+                    qsExcelEntity.setInAccountStatus("已入账");
+                }else{
+                    qsExcelEntity.setInAccountStatus("未入账");
+                }
                 excelList.add(qsExcelEntity);
             }
         }