From 40a3549248a61a48bbdf33d5a586d9b4c7c27ec8 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 7 Sep 2023 20:04:07 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=AD=E9=97=B4=E5=8A=A0=E4=B8=AAT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomsRecordDkrzServiceImpl.java    | 14 +++++++++++++
 .../service/impl/CustomsSignServiceImpl.java  |  9 ++++++++
 .../DomesticExportCustomsCkServiceImpl.java   | 13 ++++++++----
 .../DomesticExportInvoiceCkServiceImpl.java   | 21 +++++++++++++++++--
 .../src/main/resources/bootstrap-test.yaml    |  4 ++--
 .../src/main/resources/bootstrap-test.yaml    |  4 ++--
 6 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
index fd0b8fb8..5eccd675 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
@@ -3,6 +3,8 @@ package com.dxhy.customs.service.impl;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -148,6 +150,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     map.put("upgradeStatus", "1");
                     map.put("select", true);
 
+                    if(map.get("postingTime") != null) {
+                        LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                        String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        map.put("postingTime", format);
+                    }
+
                     TdxDkCount tDxDkCount = null;
                     TdxTaxCurrent tDxTaxCurrent = null;
                     List<TdxTaxCurrent> tDxTaxCurrents = customsTaxCurrentService
@@ -937,6 +945,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                         map.put("inAccountStatus","未入账");
                     }
 
+                    if(map.get("postingTime") != null) {
+                        LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                        String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        map.put("postingTime", format);
+                    }
+
                     map.put("taxAmount", AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("taxAmount"))));
                     map.put("yxTaxAmount",
                         AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("yxTaxAmount"))));
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 b29e84b5..c383cd79 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
@@ -46,6 +46,8 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -126,6 +128,13 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
                 if (map.get("fillInDate") != null) {
                     map.put("fillInDate", map.get("fillInDate"));
                 }
+
+                if(map.get("postingTime") != null) {
+                    LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                    String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    map.put("postingTime", format);
+                }
+
                 if ("1".equals(map.get("inAccountStatus"))){
                     map.put("inAccountStatus","已入账");
                 }else {
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 c4cc7d6d..94db5b12 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
@@ -143,6 +143,11 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
 
                 tDxDkCount = tdxDkCounts.get(0);
                 String fillInDate = (String)map.get("fillInDate");
+                if(map.get("postingTime") != null) {
+                    LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                    String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    map.put("postingTime", format);
+                }
                 if (!DateUtil.isInTwoDate(tDxTaxCurrent.getSelectStartDate(), tDxTaxCurrent.getSelectEndDate(),
                     fillInDate)) {
                     map.put("select", false);
@@ -565,10 +570,10 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (map.get("rzhDate") != null) {
                     map.put("rzhDate", map.get("rzhDate"));
                 }
-                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);
+                if(map.get("postingTime") != null) {
+                    LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                    String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    map.put("postingTime", format);
                 }
 
                 // 字典值转换
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 63459b6f..03364bea 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
@@ -3,6 +3,8 @@ package com.dxhy.domestic.service.ckzrz.impl;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import javax.annotation.Resource;
@@ -106,6 +108,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("inAccountStatus","未入账");
                 }
 
+                if(map.get("postingTime") != null) {
+                    LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                    String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    map.put("postingTime", format);
+                }
+
                 map.put("exportAmount", AmountFormatUtil
                     .fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
                 map.put("exportTaxAmount", AmountFormatUtil
@@ -429,6 +437,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("inAccountStatus","未入账");
                 }
 
+                if(map.get("postingTime") != null) {
+                    LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                    String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    map.put("postingTime", format);
+                }
+
                 map.put("exportAmount", AmountFormatUtil
                     .fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
                 map.put("exportTaxAmount", AmountFormatUtil
@@ -533,7 +547,6 @@ 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 = map.get("postingTime").toString();
 
                 map.put("xh",
                     String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
@@ -550,7 +563,11 @@ 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(map.get("postingTime") != null) {
+                    LocalDateTime dateTime = (LocalDateTime) map.get("postingTime");
+                    String format = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    map.put("postingTime", format);
+                }
 
                 if ("1".equals(map.get("inAccountStatus"))){
                     map.put("inAccountStatus","已入账");
diff --git a/dxhy-gateway/src/main/resources/bootstrap-test.yaml b/dxhy-gateway/src/main/resources/bootstrap-test.yaml
index 93d8103d..22c60b56 100644
--- a/dxhy-gateway/src/main/resources/bootstrap-test.yaml
+++ b/dxhy-gateway/src/main/resources/bootstrap-test.yaml
@@ -4,7 +4,7 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.146:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
@@ -19,7 +19,7 @@ spring:
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.146:33000
         # Nacos config 登录用户名
         username: admin
         # Nacos config 登录密码
diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml
index 306a4294..f22d2886 100644
--- a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml
+++ b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml
@@ -4,7 +4,7 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.146:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
@@ -19,7 +19,7 @@ spring:
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.146:33000
         # Nacos config 登录用户名
         username: admin
         # Nacos config 登录密码