Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_user0622

# Conflicts: # mhd-user-center/src/main/resources/bootstrap.yml
2026-06-29 18:24:48 +08:00
parent 9ca77a7d57 eed47e1f34
commit 183c84cb5b
19 changed files with 247 additions and 53 deletions
@@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="invoiceEndTime != null">
                and eo.INVOICE_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE})
            </if>
+            <if test="documentStartTime != null">
+                and eo.DOCUMENT_DATE >= #{documentStartTime,jdbcType=DATE}
+            </if>
+            <if test="documentEndTime != null">
+                and eo.DOCUMENT_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{documentEndTime,jdbcType=DATE})
+            </if>
 <!--            <if test="invoiceStartTime != null">-->
 <!--            and eo.INVOICE_DATE >= #{invoiceStartTime}-->
 <!--        </if>-->