From a08ed465e74b466eb75aaa1806ff19f919961344 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 19 Apr 2023 10:27:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index ef109b3b..7d353886 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -345,8 +345,7 @@
 <!--        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">-->
 <!--            and t.posting_time = #{postingTime}-->
 <!--        </if>-->
-        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99'
-        postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
             and posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
 <!--        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">-->

From b46cd7fa092a444b85ced6dcde4c67cbc6f383d2 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 19 Apr 2023 10:37:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index 7d353886..5e83cd21 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -345,7 +345,7 @@
 <!--        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">-->
 <!--            and t.posting_time = #{postingTime}-->
 <!--        </if>-->
-        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
             and posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
 <!--        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">-->

From b05d799dae11c196ae0cc881cefbfcf601ad2f92 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 19 Apr 2023 10:44:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/extend/controller/ExtInvoicePoolController.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
index ecc5d6cf..29f3280b 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
@@ -162,6 +162,11 @@ public class ExtInvoicePoolController extends AbstractController {
         if (pramsMap.get("qsyf") == null && "".equals(pramsMap.get("qsyf")) && !"1".equals(pramsMap.get("qszt"))) {
             pramsMap.put("qsyf", "");
         }
+        if (pramsMap.get("accountPeriod") != null && !"".equals(pramsMap.get("accountPeriod"))) {
+            String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
         int curr = (int)pramsMap.get("curr");
         int size = (int)pramsMap.get("size");
         try {