From 1330ef6826ffa768e7eb1f3526099c9b5f406a5e Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 11 Dec 2025 16:46:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=89=A9=E5=B1=95=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=BA=A6=E5=BB=B6=E8=BF=9F=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在XML映射文件中增加项目相关字段的查询支持
- 新增项目ID、项目编号、项目名称和项目编码字段
- 更新Java实体类以包含新的项目信息属性
- 优化数据库关联查询逻辑，提升数据完整性
- 调整字段显示顺序以便更好地展示项目进度详情
---
 .../oa/domain/vo/OaProjectScheduleDelayVo.java | 18 ++++++++++++++----
 .../mapper/oa/OaProjectScheduleDelayMapper.xml |  8 +++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java
index ebafcb3..0779354 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java
@@ -106,25 +106,35 @@ public class OaProjectScheduleDelayVo {
     /**
      * 步骤名称（来自步骤表）
      */
-    @ExcelProperty(value = "步骤名称")
     private String stepName;
 
     /**
      * 节点负责人（来自步骤表）
      */
-    @ExcelProperty(value = "节点负责人")
     private String nodeHeader;
 
     /**
      * 步骤状态（来自步骤表）
      */
-    @ExcelProperty(value = "步骤状态")
     private Long stepStatus;
 
     /**
      * 所属进度ID（来自步骤表）
      */
-    @ExcelProperty(value = "所属进度ID")
     private Long scheduleId;
 
+    private String tabNode;
+    private String firstLevelNode;
+    private String secondLevelNode;
+    private Date startTime;
+    private String specification;
+
+    private Long projectId;
+
+    private String projectNum;
+
+    private String projectName;
+
+    private String projectCode;
+
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml
index c6f3da4..01a9a36 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml
@@ -46,9 +46,15 @@
                opss.first_level_node  AS firstLevelNode,
                opss.second_level_node AS secondLevelNode,
                opss.start_time        AS startTime,
-               opss.specification     AS specification
+               opss.specification     AS specification,
+               ops.project_id         AS projectId,
+               p.project_num          AS projectNum,
+               p.project_name         AS projectName,
+               p.project_code         AS projectCode
         FROM oa_project_schedule_delay opsd
                  LEFT JOIN oa_project_schedule_step opss ON opss.track_id = opsd.track_id
+                 LEFT JOIN oa_project_schedule ops ON ops.schedule_id = opss.schedule_id
+                 LEFT JOIN sys_oa_project p ON p.project_id = ops.project_id
             ${ew.customSqlSegment}
     </select>