Merge remote-tracking branch 'origin/master'

xiangpei

2024-12-06 6f094df5ca2b3fd83f6c2c64c72dd177756d4601

 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>