From 308ed7512167f4a35e80c7e8ee8e87381c5dfb22 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 12 Jan 2025 15:33:37 +0800
Subject: [PATCH] md

---
 .../mapper/EmisCustomerUserMapper.xml         |  3 ---
 .../resources/mapper/EmisWaybillMapper.xml    | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index f6cd75a79..97c7c0d82 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -60,15 +60,12 @@
         <result property="status"    column="status"    />
         <result property="orderNum"    column="order_num"    />
 
-
-
         <result property="custNo"    column="monthly_pay_code"    />
         <result property="custName"    column="customer_name"    />
 
         <result property="payeeName"    column="payee"    />
         <result property="salesmenName"    column="salesmen"    />
 
-
         <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
         <association property="provinceName"    column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
         <association property="cityName"    column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index dc086265a..90a2f9acd 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1913,6 +1913,7 @@
 
             and ( a.problem_type is null  or (a.problem_type is not null and (a.problem_type != 173 and  a.problem_type != 170 and  a.problem_type != 151) ) )
 
+            <!--
             <if test="params.queryDateType != null and params.queryDateType == 1 ">
                 and to_days(a.send_date) = to_days(now())
             </if>
@@ -1929,6 +1930,15 @@
                 and YEAR(a.send_date)=YEAR(NOW())
             </if>
 
+            -->
+
+            <if test="params.beginDate != null and params.beginDate != ''">
+                and a.send_date <![CDATA[ >= ]]>  #{params.beginDate}
+            </if>
+            <if test="params.endDate != null and params.endDate != ''">
+                and a.send_date <![CDATA[ <= ]]>  #{params.endDate}
+            </if>
+
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and a.salesmen=#{salesmen}
             </if>
@@ -1956,6 +1966,8 @@
             and a.receive_country=b.code and a.trans_line_type=c.line_code
             and ( a.problem_type is null  or (a.problem_type is not null and (a.problem_type != 173 and  a.problem_type != 170 and  a.problem_type != 151) ) )
 
+
+            <!--
             <if test="params.queryDateType != null and params.queryDateType == 1 ">
                 and to_days(a.send_date) = to_days(now())
             </if>
@@ -1975,6 +1987,15 @@
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and a.salesmen=#{salesmen}
             </if>
+            -->
+
+
+            <if test="params.beginDate != null and params.beginDate != ''">
+                and a.send_date <![CDATA[ >= ]]>  #{params.beginDate}
+            </if>
+            <if test="params.endDate != null and params.endDate != ''">
+                and a.send_date <![CDATA[ <= ]]>  #{params.endDate}
+            </if>
 
         </where>
         group by b.code