feat:添加时间段查询

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java

@@ -29,6 +29,7 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
                 .eq(ObjectUtil.isNotEmpty(dto.getOrderType()), HardOrderEntity::getOrderType, dto.getOrderType())
                 .eq(ObjectUtil.isNotEmpty(dto.getPayType()), HardOrderEntity::getPayType, dto.getPayType())
                 .eq(ObjectUtil.isNotEmpty(dto.getOrderStatus()), HardOrderEntity::getOrderStatus, dto.getOrderStatus())
+                .eq(ObjectUtil.isNotEmpty(dto.getHourType()), HardOrderEntity::getHourType, dto.getHourType())
                 .in(ObjectUtil.isNotEmpty(dto.getOrderIds()), HardOrderEntity::getId, dto.getOrderIds())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds())
                 .in(ObjectUtil.isNotEmpty(dto.getHardIds()), HardOrderEntity::getHardId, dto.getHardIds())

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml

@@ -74,6 +74,9 @@
 
     <sql id="whereA">
         a.del_flag = '0'
+        <if test="dto.hourType != null and dto.hourType != '' ">
+            and a.hour_type = #{dto.hourType}
+        </if>
         <if test="dto.orderStatusCodes != null and dto.orderStatusCodes.size() != 0">
             and a.order_status in
             <foreach collection="dto.orderStatusCodes" item="v" open="(" close=")" separator=",">