Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java

@@ -149,4 +149,7 @@ public class DevInfoVo extends DevInfo {
     @ApiModelProperty(value = "结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endTime;
+
+    @ApiModelProperty(value = "订单编码")
+    private String orderCode;
 }

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml

@@ -353,6 +353,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
         WHERE
             md.ma_id = #{maId}
+        <if test="orderCode != null and orderCode != ''">
+            AND moi.`code` like concat( '%',#{orderCode},'%' )
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND ((md.rent_begin_time BETWEEN #{startTime} AND #{endTime})
+            OR (md.rent_end_time BETWEEN #{startTime} AND #{endTime})
+            OR (md.rent_begin_time &lt; #{startTime} AND md.rent_end_time > #{endTime}))
+        </if>
         ORDER BY
             moi.order_time DESC
     </select>