From ee9bbaa6c5fc87d28b4b02de56d25f98c41f057a Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 25 Jul 2023 10:24:58 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BC=98=E5=8C=96sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BaseInvoiceController.java   | 16 ++++++++++------
 .../main/resources/mapper/BaseFpcjmxMapper.xml   |  4 ++--
 2 files changed, 12 insertions(+), 8 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 2d3f13e5..b042f158 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
@@ -203,13 +203,17 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("payment", map.get("payment"));
         pramsMap.put("paymentStatus", map.get("paymentStatus"));
 
-        if(StringUtils.isNotEmpty(map.get("paymentDateStart").toString())) {
-            String paymentDateStart = DateUtils.getMorning(DateUtils.strToDate(map.get("paymentDateStart").toString()));
-            pramsMap.put("paymentDateStart", paymentDateStart);
+        if(map.get("paymentDateStart") != null) {
+            if (StringUtils.isNotEmpty(map.get("paymentDateStart").toString())) {
+                String paymentDateStart = DateUtils.getMorning(DateUtils.strToDate(map.get("paymentDateStart").toString()));
+                pramsMap.put("paymentDateStart", paymentDateStart);
+            }
         }
-        if(StringUtils.isNotEmpty(map.get("paymentEnd").toString())) {
-            String paymentDateEnd = DateUtils.getNight(DateUtils.strToDate(map.get("paymentEnd").toString()));
-            pramsMap.put("paymentDateEnd", paymentDateEnd);
+        if(map.get("paymentEnd") != null) {
+            if (StringUtils.isNotEmpty(map.get("paymentEnd").toString())) {
+                String paymentDateEnd = DateUtils.getNight(DateUtils.strToDate(map.get("paymentEnd").toString()));
+                pramsMap.put("paymentDateEnd", paymentDateEnd);
+            }
         }
 
         pramsMap.put("voucherNumber", map.get("voucherNumber"));
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml
index bd304d10..37629e8a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml
@@ -55,7 +55,7 @@
         from t_dx_record_invoice t
         where t.gf_tax_no = #{gfsh}
         and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08'))
-        and t.create_date = #{cjrq}
+        and DATE_FORMAT(t.create_date,'%Y-%m-%d') = #{cjrq}
         <if test="ycpbz != null and ycpbz != '' and ycpbz != 'null' ">
             and t.invoice_status !='0'
         </if>
@@ -71,7 +71,7 @@
         from t_dx_record_invoice t
         where t.gf_tax_no = #{gfsh}
         and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08'))
-        and t.create_date between #{cjrq} and #{cjrq}
+        and to_char(t.create_date,'yyyy-mm-dd') between #{cjrq} and #{cjrq}
         <if test="ycpbz != null and ycpbz != '' and ycpbz != 'null' ">
             and t.invoice_status !='0'
         </if>