diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index c0b2de83..32caab51 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -224,8 +224,8 @@ from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) - CONVERT(date,eo.create_time) = #{createTime} + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + CONVERT(date,eo.create_time) = #{createTime} and eo.plan_type = #{planType} and eo.del_flag = '0' and eo.order_status != '1' @@ -279,8 +279,8 @@ from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) - and CONVERT(date,eo.create_time) = #{createTime} + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + and CONVERT(date,eo.create_time) = #{createTime} and eo.del_flag = '0' and eo.order_status = '1' and eo.plan_type = #{planType}