From 043c1aaf66a6b7653b45a91ba087a7e63f99904e Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 11:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java        | 2 +-
 .../tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java    | 3 ++-
 .../java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java | 3 +++
 3 files changed, 6 insertions(+), 2 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 4da59a73..83a6dccf 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
@@ -202,7 +202,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     }
                     if ("1".equals(pageList.get(i).getInAccountStatus())) {
                         vo.setInAccountStatus("已入账");
-                    } else if ("0".equals(pageList.get(i).getInAccountStatus())) {
+                    } {
                         vo.setInAccountStatus("未入账");
                     }
                     String suspendStatus = pageList.get(i).getSuspendStatus();
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
index ad633f7f..f1409934 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.*;
 
 import javax.annotation.Resource;
 
+import cn.hutool.core.codec.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -438,7 +439,7 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         String dbName = (String) pramsMap.get("dbName");
         DynamicContextHolder.push(dbName+DbConstant.BUSINESS_WRITE);
         super.baseMapper.updateSuspendType(pramsMap);
-        return "操作成功";
+        return Base64.encode("操作成功");
     }
 
     @Override
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
index 64bd9b0c..db010c0d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
@@ -379,6 +379,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                     //入账状态
                     updateWrapper.set("inaccount_status",zdata1.getZYWZT());
                     updateWrapper.set("comp_code",zdata1.getZGSDM());
+                    updateWrapper.set("bzr",zdata1.getZJBR());
                     DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                     int update = tDxrecordInvoiceDao.update(null, updateWrapper);
                     if(update>0){
@@ -414,6 +415,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 //入账状态
                 updateWrapper.set("inaccount_status",zdata1.getZYWZT());
                 updateWrapper.set("comp_code",zdata1.getZGSDM());
+                updateWrapper.set("bzr",zdata1.getZJBR());
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
             }
@@ -425,6 +427,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             updateWrapper.set("bzdh",zdata1.getZBZDH());
             updateWrapper.set("inaccount_status",zdata1.getZYWZT());
             updateWrapper.set("comp_code",zdata1.getZGSDM());
+            updateWrapper.set("bzr",zdata1.getZJBR());
             updateWrapper.eq("uuid",uuid);
             tdxSaleRecordInvoiceDao.update(null,updateWrapper);
             if(!flag){