From 361dba7181795d220fc8b46d1ba60817c3198343 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 17 Jul 2023 08:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml
index 381b90e8..e0af8d38 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml
@@ -85,7 +85,8 @@
         t.invoice_type,t.invoice_code,t.invoice_no,invoice_date,t.invoice_amount,t.tax_amount,t.gf_name,t.xf_name,t.check_code,create_date,invoice_source
         ,t.total_amount,t.ele_invoice_no
         from t_dx_record_invoice t
-        where t.company = #{company}
+        where t.create_date between #{cjksrq} and #{cjjsrq}
+        and t.company = #{company}
         and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08'))
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
@@ -105,7 +106,6 @@
         </if>
         and t.source_system = '0'
         and t.detail_yesorno = '0'
-        and date_format(t.create_date,'%Y-%m-%d') between #{cjksrq} and #{cjjsrq}
         order by t.create_date desc,t.invoice_date desc
     </select>
 
@@ -144,7 +144,8 @@
         select
         count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
         from t_dx_record_invoice t
-        where t.company = #{company}
+        where t.create_date between #{cjksrq} and #{cjjsrq}
+        and t.company = #{company}
         and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08'))
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
@@ -164,7 +165,6 @@
         </if>
         and t.source_system = '0'
         and t.detail_yesorno = '0'
-        and date_format(t.create_date,'%Y-%m-%d') between #{cjksrq} and #{cjjsrq}
     </select>
 
     <select id="selectWbfpmxHj" parameterType="java.util.Map"