From f9efefa003ec7c11a2f5a3e7e2e826206450b3f9 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Mon, 13 Oct 2025 10:56:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OaReportSummary 实体中新增 status 字段表示状态
- 在 OaReportSummary中同步Bo 业务对象添加 status 字段- 更新 MyBatis 映射文件以支持 status 字段的查询
- 在 OaReportSummaryVo 视图对象中添加 status 展示支持
- 状态字段支持导出到 Excel 文件中显示
- 完善相关注释和字段说明文档信息
---
 .../src/main/java/com/ruoyi/oa/domain/OaReportSummary.java  | 5 +++++
 .../main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java | 5 +++++
 .../main/java/com/ruoyi/oa/domain/vo/OaReportSummaryVo.java | 6 ++++++
 .../src/main/resources/mapper/oa/OaReportSummaryMapper.xml  | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSummary.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSummary.java
index f105e94..2095186 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSummary.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSummary.java
@@ -57,4 +57,9 @@ public class OaReportSummary extends BaseEntity {
 
     private Long type;
 
+    /**
+     * 状态（0进行中 1已完成）
+     */
+    private Integer status;
+
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java
index bbc234e..5e4e280 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java
@@ -61,4 +61,9 @@ public class OaReportSummaryBo extends BaseEntity {
 
     private Long type;
 
+    /**
+     * 状态（0进行中 1已完成）
+     */
+    private Integer status;
+
 }
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 87ad3e1..4fc53f8 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
@@ -70,4 +70,10 @@ public class OaReportSummaryVo {
     @ExcelProperty(value = "最近更新时间")
     private Date lastUpdateTime;
 
+    /**
+     * 状态（0进行中 1已完成）
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml
index c8f71fa..5aadcf7 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml
@@ -17,6 +17,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
         <result property="type" column="type"/>
+        <result property="status" column="status"/>
     </resultMap>
 
     <select id="selectVoPageWithProject" resultType="com.ruoyi.oa.domain.vo.OaReportSummaryVo">
@@ -27,6 +28,7 @@
         s.reporter,
         s.project_id AS projectId,
         s.remark,
+        s.status,
         s.type,
         p.project_name AS projectName,
         d.latest_create_time AS lastUpdateTime