From 730727c3f2933d7f57c9f5f14d6f7b710552b054 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 31 Mar 2025 10:18:49 +0800 Subject: [PATCH] =?UTF-8?q?2025-03-31=20=E8=AE=BE=E5=A4=87=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/pms/EamMapper.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 3665d7bd..29e1b4c7 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -2286,12 +2286,11 @@ a.ObjectID FROM eam_workPlan a LEFT JOIN eam_workOrder b ON a.site = b.site AND a.PlanID = b.PlanID and a.FunctionType = b.FunctionType and a.ObjectID = b.ObjectID and a.bu_no = b.bu_no - WHERE a.site = #{site} and a.bu_no = #{buNo} + WHERE a.site = #{site} and a.bu_no = #{buNo} and a.check_type = #{checkType} AND a.ObjectID = #{objectID} AND a.FunctionType = #{functionType} AND a.Status in ('已计划','进行中') AND a.deleteFlag = 'N' AND (convert(varchar(10), a.PlanStartDate, 120) between #{planStartDate} and #{planEndDate} or convert(varchar(10), a.PlanEndDate, 120) between #{planStartDate} and #{planEndDate} - or (DATEDIFF(day, a.PlanStartDate, #{planStartDate}) >= 0 and DATEDIFF(day, #{planEndDate}, a.PlanEndDate) >= 0) - ) + or (DATEDIFF(day, a.PlanStartDate, #{planStartDate}) >= 0 and DATEDIFF(day, #{planEndDate}, a.PlanEndDate) >= 0)) and a.PropertiesCode = #{propertiesCode} and a.plan_cycle = #{planCycle} and a.PlanPeriod = #{planPeriod} and b.Status not in ('已取消','已完成','待审核')