From 9223aa2d170a11a3c71bebe7302bdcb53c601e0a Mon Sep 17 00:00:00 2001 From: liuao <1150003126@qq.com> Date: Thu, 15 May 2025 09:14:49 +0800 Subject: [PATCH] =?UTF-8?q?2025=E5=B9=B45=E6=9C=8815=E6=97=A509:14:35=201.?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/IResourceScheduleMapper.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mappers/IResourceScheduleMapper.xml b/src/main/resources/mappers/IResourceScheduleMapper.xml index 13c7d02..cd93a75 100644 --- a/src/main/resources/mappers/IResourceScheduleMapper.xml +++ b/src/main/resources/mappers/IResourceScheduleMapper.xml @@ -61,11 +61,10 @@ id, plan_id, plan_name, start_time, end_time, create_time, creator, current_prog INNER JOIN ( SELECT plan_id, accumulative_progress, process_date - FROM i_progress ba - INNER JOIN (SELECT plan_id AS bbId,MAX(process_date) AS real_date FROM i_progress GROUP BY plan_id) bb + FROM i_progress_new ba + INNER JOIN (SELECT plan_id AS bbId,MAX(process_date) AS real_date FROM i_progress_new GROUP BY plan_id) bb ON ba.plan_id = bb.bbId AND ba.process_date = bb.real_date - WHERE parent_id = 0 - AND process_date = (SELECT MAX(process_date) FROM i_progress bb WHERE bb.plan_id = ba.plan_id) + WHERE process_date = (SELECT MAX(process_date) FROM i_progress bb WHERE bb.plan_id = ba.plan_id) ) b ON a.id = b.plan_id