From ad6a05f2535c1f29a764f352d8ca666cae1b97d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 22 二月 2025 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java
---
business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
index 5e7ddeb..8c2db13 100644
--- a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
@@ -68,7 +68,7 @@
</select>
- <select id="getDetail" resultType="com.ycl.domain.vo.ProgressReportResponseVO">
+ <select id="getDetail" resultType="com.ycl.domain.form.ProgressReportResponseForm">
SELECT
ppi.id,
pppr.id AS progress_report_id,
@@ -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,11 @@
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>
--
Gitblit v1.8.0