From 6f094df5ca2b3fd83f6c2c64c72dd177756d4601 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 十二月 2024 14:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
index 8d2b74d..893f1cb 100644
--- a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
@@ -76,11 +76,12 @@
ppr.plan_time,
ppr.plan_time_flag,
ppi.title,
+ ppi.progress_status AS progress_status_int,
ppi.start_time,
ppi.end_time,
pppr.start_time AS actual_start_time,
pppr.end_time AS actual_end_time,
- pppr.progress_status,
+ pppr.progress_status AS progress_status_str,
pppr.actual_invest,
pper.department_examine,
pper.department_approval,
@@ -91,8 +92,12 @@
FROM t_project_plan_info AS ppi
INNER JOIN t_project_plan_record AS ppr ON ppi.project_plan_record_id = ppr.id
LEFT JOIN t_project_plan_progress_report AS pppr ON pppr.project_plan_info_id = ppi.id
- RIGHT JOIN t_project_plan_examine_record AS pper ON pper.project_plan_info_id = ppi.id
- WHERE ppi.id = #{id}
+ LEFT JOIN t_project_plan_examine_record AS pper ON pper.project_plan_info_id = ppi.id
+ WHERE
+ ppi.id = #{id}
+ AND pper.event_type = 2
+ AND pper.deleted = 0
+ ORDER BY pper.gmt_create DESC LIMIT 1
</select>
</mapper>
--
Gitblit v1.8.0