diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportSummaryVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportSummaryVo.java index ec6c796..87ad3e1 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportSummaryVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportSummaryVo.java @@ -67,5 +67,7 @@ public class OaReportSummaryVo { private Long type; + @ExcelProperty(value = "最近更新时间") + private Date lastUpdateTime; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml index c9f668d..d5bd4ce 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml @@ -28,9 +28,17 @@ s.project_id AS projectId, s.remark, s.type, - p.project_name AS projectName + p.project_name AS projectName, + d.latest_create_time AS lastUpdateTime FROM oa_report_summary s LEFT JOIN sys_oa_project p ON s.project_id = p.project_id + LEFT JOIN ( + SELECT + summary_id, + create_time AS latest_create_time, + ROW_NUMBER() OVER (PARTITION BY summary_id ORDER BY create_time DESC) AS rn + FROM oa_report_detail + ) d ON s.summary_id = d.summary_id AND d.rn = 1 AND s.report_title LIKE CONCAT('%', #{bo.reportTitle}, '%')