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}