From c651a1212e668b7404375b9d9d4c1873b75b234a Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 28 May 2024 13:43:02 +0800
Subject: [PATCH] =?UTF-8?q?2024-5-28=20=E8=AE=BE=E5=A4=87-=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80/=E5=B7=A1=E6=A3=80/=E4=BF=9D=E5=85=BB-=E5=BD=93?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/device/DeviceTaskMapper.xml     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml
index ace6103e..03821183 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml
@@ -38,14 +38,17 @@
     </select>
     <select id="getNewTaskOrder" resultType="com.op.device.domain.EquOrder">
         select top 1 order_code orderCode,
-                     create_time createTime
+        create_time createTime
         <if test="planLoopType=='day'">, DATEDIFF (day, create_time, GETDATE()) days </if>
         <if test="planLoopType=='week'">, DATEDIFF (week, create_time, GETDATE()) days </if>
         <if test="planLoopType=='month'">, DATEDIFF (month, create_time, GETDATE()) days </if>
         <if test="planLoopType=='season'">, DATEDIFF (month, create_time, GETDATE())/3 days </if>
         <if test="planLoopType=='year'">, DATEDIFF (year, create_time, GETDATE()) days </if>
         from equ_order
-        where plan_type = #{planType} and plan_code = #{planCode} and equipment_code = #{equipmentCode}
+        where plan_type = #{planType}
+        and plan_code = #{planCode}
+        and equipment_code = #{equipmentCode}
+        and del_flag = '0'
         order by create_time desc
     </select>
     <select id="getNewTaskOrder0" resultType="com.op.device.domain.EquOrder">
@@ -57,7 +60,10 @@
         <if test='planLoopType=="season"'> DATEDIFF (month, order_start, GETDATE())/3 days </if>
         <if test='planLoopType=="year"'> DATEDIFF (year, order_start, GETDATE()) days </if>
         from equ_order
-        where plan_type = #{planType} and plan_code = #{planCode} and equipment_code = #{equipmentCode}
+        where plan_type = #{planType}
+        and plan_code = #{planCode}
+        and equipment_code = #{equipmentCode}
+        and del_flag = '0'
         order by create_time desc
     </select>
 </mapper>