diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index d4c3b92f8..bab114ef5 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -416,10 +416,10 @@ and a.ORDER_DATE = #{orderDate} - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart} + and a.create_time >= #{createTimeStart} - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} + and a.create_time date_add(#{createTimeEnd}, interval 1 day) and PUSH_TIME =]]> #{pushTimeStart} @@ -443,16 +443,16 @@ and a.create_by_name like concat('%', #{createByName}, '%') - and date_format(a.storage_time,'%Y-%m-%d') >= #{storageTimeStart} + and a.storage_time >= #{storageTimeStart} - and date_format(a.storage_time,'%Y-%m-%d') <= #{storageTimeEnd} + and a.storage_time date_add(#{storageTimeEnd}, interval 1 day) - and date_format(a.expect_time,'%Y-%m-%d') >= #{expectTimeStart} + and a.expect_time >= #{expectTimeStart} - and date_format(a.expect_time,'%Y-%m-%d') <= #{expectTimeEnd} + and a.expect_time date_add(#{expectTimeEnd}, interval 1 day) and a.issue_time is not null diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index 870077d54..0a8df156d 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -337,20 +337,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.create_by_name like concat('%', #{createByName}, '%') - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart} + and a.create_time >= #{createTimeStart} - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} + and a.create_time date_add(#{createTimeEnd}, interval 1 day) + + + and a.outbound_date >= #{outboundDateStart} + + + and a.outbound_date date_add(#{outboundDateEnd}, interval 1 day) and a.organization_id = #{organizationId} - - and date_format(a.outbound_date,'%Y-%m-%d') >= #{outboundDateStart} - - - and date_format(a.outbound_date,'%Y-%m-%d') <= #{outboundDateEnd} - and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))