Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -228,6 +228,10 @@
 		left join base_equipment be on eo.equipment_code = be.equipment_code
         <where>
             <if test="createTime == null and planType == 'spotInspection'">CONVERT(date,eo.create_time) =  CONVERT(date,GETDATE())</if>
+            <if test="createTime == null and planType != 'spotInspection'">
+                AND eo.create_time &gt;= DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1)
+                AND eo.create_time &lt; DATEADD(MONTH, 1, DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1))
+            </if>
             <if test="createTime != null and planType == 'spotInspection'">CONVERT(date,eo.create_time) = #{createTime}</if>
             and eo.plan_type = #{planType}
 		    and eo.del_flag = '0'
@@ -283,6 +287,10 @@
 	    left join base_equipment be on eo.equipment_code = be.equipment_code
         <where>
             <if test="createTime == null and planType == 'spotInspection'">CONVERT(date,eo.create_time) =  CONVERT(date,GETDATE())</if>
+            <if test="createTime == null and planType != 'spotInspection'">
+                AND eo.create_time &gt;= DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1)
+                AND eo.create_time &lt; DATEADD(MONTH, 1, DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1))
+            </if>
             <if test="createTime != null and planType == 'spotInspection'">and CONVERT(date,eo.create_time) = #{createTime}</if>
 		    and eo.del_flag = '0'
 		    and eo.order_status = '1'