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" and eo.CREATE_TIME >= #{createStartTime} + + and eo.INVOICE_Status = #{invoiceStatus} + and eo.CREATE_TIME <= #{createEndTime} + 1 - 1/86400 @@ -55,11 +58,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and eo.GOODS_NUMBER like concat('%', #{goodsNumber}, '%') - and eo.INVOICE_DATE >= #{invoiceStartTime} + and eo.INVOICE_DATE >= #{invoiceStartTime,jdbcType=DATE} - and eo.INVOICE_DATE <= #{invoiceEndTime} + and eo.INVOICE_DATE DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE}) + + + + + + + + and eo.BUSINESS_UNIT like concat('%', #{businessUnit}, '%') @@ -90,9 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and eo.ORGANIZATION_NAME like concat('%', #{organizationName}, '%') - - and eo.TOP_ORGANIZATION_ID = #{topOrganizationId} - +