From 925b9627901becc03459b0e38ef204b244e45619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Thu, 4 Jun 2026 19:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E7=89=8C=E7=8A=B6=E6=80=81=E4=B8=8E=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executeOrder/ExecuteOrderMapper.xml       | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
index a4928ac07..44603eeb8 100644
--- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
@@ -42,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createStartTime != null">
                 and eo.CREATE_TIME &gt;= #{createStartTime}
             </if>
+            <if test="invoiceStatus != null">
+                and eo.INVOICE_Status = #{invoiceStatus}
+            </if>
             <if test="createEndTime != null">
                 and eo.CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
             </if>
@@ -55,11 +58,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and eo.GOODS_NUMBER like concat('%', #{goodsNumber}, '%')
             </if>
             <if test="invoiceStartTime != null">
-                and eo.INVOICE_DATE &gt;= #{invoiceStartTime}
+                and eo.INVOICE_DATE >= #{invoiceStartTime,jdbcType=DATE}
             </if>
             <if test="invoiceEndTime != null">
-                and eo.INVOICE_DATE &lt;= #{invoiceEndTime}
+                and eo.INVOICE_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE})
             </if>
+<!--            <if test="invoiceStartTime != null">-->
+<!--            and eo.INVOICE_DATE >= #{invoiceStartTime}-->
+<!--        </if>-->
+<!--            <if test="invoiceEndTime != null">-->
+<!--                &#45;&#45;                 and eo.INVOICE_DATE &lt;= #{invoiceEndTime}-->
+<!--                and eo.INVOICE_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{invoiceEndTime})-->
+<!--            </if>-->
+
             <if test="businessUnit != null and businessUnit != ''">
                 and eo.BUSINESS_UNIT like concat('%', #{businessUnit}, '%')
             </if>
@@ -90,9 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="organizationName != null and organizationName != ''">
                 and eo.ORGANIZATION_NAME like concat('%', #{organizationName}, '%')
             </if>
-            <if test="topOrganizationId != null ">
-                and eo.TOP_ORGANIZATION_ID = #{topOrganizationId}
-            </if>
+
         </where>
     </sql>