From c3f73dc371c7bfe03e0759d47efe96225b05ce42 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 9 Oct 2023 11:02:22 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=B5=B7=E5=85=B3=E7=BC=B4=E6=AC=BE?=
 =?UTF-8?q?=E4=B9=A6=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=E8=BD=AC=E5=86=85=E9=94=80=E5=8F=91=E7=A5=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=20=20=20=20=20=20=20=E8=BD=AC=E5=86=85=E9=94=80?=
 =?UTF-8?q?=E7=BC=B4=E6=AC=BE=E4=B9=A6=E6=9F=A5=E8=AF=A2=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=E5=8F=91=E7=A5=A8=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BA=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E8=AE=BE=E7=BD=AE=E6=88=90admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomsCustomsJkszhcxServiceImpl.java       | 5 +++++
 .../count/impl/DomesticCustomsExportCountServiceImpl.java    | 5 +++++
 .../count/impl/DomesticInvoiceExportCountServiceImpl.java    | 5 ++++-
 .../dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java    | 4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
index 76a0b2d7..14efeb9d 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
@@ -148,6 +148,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     pageList.get(i).setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
                     String rzhYesorno = pageList.get(i).getRzhYesorno();
                     pageList.get(i).setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
+
+                    String confirmUser = pageList.get(i).getConfirmUser();
+                    if(StringUtils.isEmpty(confirmUser)){
+                        pageList.get(i).setConfirmUser(confirmUser);
+                    }
                 }
             }
             // 设置记录总数
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java
index 96065fbd..6185c907 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java
@@ -92,6 +92,11 @@ public class DomesticCustomsExportCountServiceImpl extends MpBaseServiceImpl<Dom
                     AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("yxExportTaxAmount"))));
                 map.put("select", true);
 
+                String confirmUser = (String)map.get("confirmUser");
+                if(StringUtils.isEmpty(confirmUser)){
+                    map.put("confirmUser","admin");
+                }
+
                 if ("1".equals(map.get("inAccountStatus"))){
                     map.put("inAccountStatus","已入账");
                 }else {
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java
index f6c4ebbb..de8f92bc 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java
@@ -89,7 +89,10 @@ public class DomesticInvoiceExportCountServiceImpl extends MpBaseServiceImpl<Dom
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                 String cxbdkStatus = (String)map.get("cxbdkStatus");
                 map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxbdkStatus));
-
+                String confirmUser = (String)map.get("confirmUser");
+                if(StringUtils.isEmpty(confirmUser)){
+                    map.put("confirmUser","admin");
+                }
                 // if (cxrzModels!=null){
                 // for (DictdetaModel model:cxrzModels){
                 // if (model.getDictcode().equals(map.get("cxbdkStatus"))){
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
index a8550b63..cb74f6ef 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
@@ -101,6 +101,10 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                                 AmountFormatUtil.fmtMicrometer(MathUtil.round(resultList.get(i).getTaxAmount())));
                         }
                     }
+                    String rzhr = resultList.get(i).getRzhr();
+                    if(StringUtils.isEmpty(rzhr)){
+                        resultList.get(i).setRzhr("admin");
+                    }
 
                     resultList.get(i)
                         .setTaxAmount(AmountFormatUtil.fmtMicrometer(MathUtil.round(resultList.get(i).getTaxAmount())));