From e7c7984aa662d62d998a4774c922ead7d087cfa5 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Tue, 23 Dec 2025 19:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9B=B8=E5=85=B3-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/scheduling/controller/WorkOrderController.java | 1 - .../scheduling/scheduling/mapper/WorkOrderMapper.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java index 2cbb6ac..a54f2d1 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java @@ -73,7 +73,6 @@ public class WorkOrderController extends BladeController { private final IWorkOrderService workOrderService; - private final StringRedisTemplate stringRedisTemplate; /** * 车间订单表 详情 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index 9fdec58..1b3c0a4 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -206,7 +206,7 @@ LEFT JOIN BS_TEAM_SET g on c.MAKE_TEAM = g.ID LEFT JOIN MES_WORK_PLAN h on h.wo_id = a.id - a.is_deleted = 0 + a.is_deleted = 0 and h.is_deleted = 0 and (to_char(h.start_time,'YYYY-MM-DD') = #{startTime} or (h.start_time to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and h.end_time ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))