From be751aa7e8ead1949bc8a4d5d7de6a7437dc610c Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Thu, 22 May 2025 17:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/device/EquOrderMapper.xml   | 8 ++++++++
 1 file changed, 8 insertions(+)

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 c77d63b19..0e255a72a 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
@@ -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'