From 3638a80caa91edd571f450b5522ffde13f836da7 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 18 May 2023 14:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E5=87=BA=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     | 26 ++++++++++++++-----
 .../BaseIntelligentizeCheckServiceImpl.java   |  3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 5e4b1114..9363acee 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -792,7 +792,7 @@ public class BaseInvoiceController extends AbstractController {
         String qsjsrq = (String)map.get("qsjsrq");
         String xfmc = (String)map.get("xfmc");
         String maxTax = (String)map.get("maxTax");
-        String yxsxfs = (String)map.get("yxsxfs");
+//        String yxsxfs = (String)map.get("yxsxfs");
         String qsr = (String)map.get("qsr");
         String invoiceNo = (String)map.get("invoiceNo");
         String companyCode = (String) map.get("companyCode");
@@ -802,7 +802,20 @@ public class BaseInvoiceController extends AbstractController {
         String postingTimeStart = (String) map.get("postingTimeStart");
         String snVoucherNumber = (String) map.get("snVoucherNumber");
         String imageNumber = (String) map.get("imageNumber");
+        String accountPeriod = (String) map.get("accountPeriod");
         Map<String, Object> pramsMap = new HashMap<>(18);
+        pramsMap.put("bzdh",bzdh);
+        pramsMap.put("companyCode",companyCode);
+        pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
+        pramsMap.put("inAccountStatus",inAccountStatus);
+        pramsMap.put("postingTimeEnd",postingTimeEnd);
+        pramsMap.put("postingTimeStart",postingTimeStart);
+        pramsMap.put("snVoucherNumber",snVoucherNumber);
+        pramsMap.put("imageNumber",imageNumber);
+        if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length()>7){
+            accountPeriod = accountPeriod.substring(0,7);
+            pramsMap.put("accountPeriod",accountPeriod);
+        }
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         List<Tax> taxList = getUserInfo().getOrg();
@@ -818,11 +831,11 @@ public class BaseInvoiceController extends AbstractController {
 //        } else {
 //            return ResponseEntity.ok(R.error("税额容差不能为空！"));
 //        }
-        if (StringUtils.isNotBlank(yxsxfs)) {
-            pramsMap.put("yxsxfs", yxsxfs);
-        } else {
-            return ResponseEntity.ok(R.error("优先筛选方式不能为空！"));
-        }
+//        if (StringUtils.isNotBlank(yxsxfs)) {
+//            pramsMap.put("yxsxfs", yxsxfs);
+//        } else {
+//            return ResponseEntity.ok(R.error("优先筛选方式不能为空！"));
+//        }
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             pramsMap.put("gfsh", gfsh);
         } else {
@@ -921,6 +934,7 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("userName", getUserName());
+        pramsMap.put("userAccount",getUserInfo().getLoginname());
         pramsMap.put("company", map.get("company"));
         pramsMap.put("menuId", map.get("menuId"));
         pramsMap.put("gxType", map.get("gxType"));
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseIntelligentizeCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseIntelligentizeCheckServiceImpl.java
index 70abfdfc..b9737d32 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseIntelligentizeCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseIntelligentizeCheckServiceImpl.java
@@ -159,9 +159,10 @@ public class BaseIntelligentizeCheckServiceImpl extends MpBaseServiceImpl<BaseTD
                 Map<String, Object> map = new HashMap<>();
                 map.put("gxType", "3");
                 map.put("dkTaxAmount", recordInvoice.getTaxAmount());
-                map.put("userAccount", pramsMap.get("userName"));
+                map.put("userAccount", pramsMap.get("userAccount"));
                 map.put("id", id);
                 map.put("bdkStatus", "1");
+                map.put("userName",pramsMap.get("userName"));
                 super.baseMapper.updateGx(map);
                 count++;
                 taxAmount = taxAmount.add(recordInvoice.getTaxAmount());