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