feat(oa): 扩展项目进度延迟视图数据字段
- 在XML映射文件中增加项目相关字段的查询支持 - 新增项目ID、项目编号、项目名称和项目编码字段 - 更新Java实体类以包含新的项目信息属性 - 优化数据库关联查询逻辑,提升数据完整性 - 调整字段显示顺序以便更好地展示项目进度详情
This commit is contained in:
@@ -106,25 +106,35 @@ public class OaProjectScheduleDelayVo {
|
|||||||
/**
|
/**
|
||||||
* 步骤名称(来自步骤表)
|
* 步骤名称(来自步骤表)
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "步骤名称")
|
|
||||||
private String stepName;
|
private String stepName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 节点负责人(来自步骤表)
|
* 节点负责人(来自步骤表)
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "节点负责人")
|
|
||||||
private String nodeHeader;
|
private String nodeHeader;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 步骤状态(来自步骤表)
|
* 步骤状态(来自步骤表)
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "步骤状态")
|
|
||||||
private Long stepStatus;
|
private Long stepStatus;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所属进度ID(来自步骤表)
|
* 所属进度ID(来自步骤表)
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "所属进度ID")
|
|
||||||
private Long scheduleId;
|
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;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,9 +46,15 @@
|
|||||||
opss.first_level_node AS firstLevelNode,
|
opss.first_level_node AS firstLevelNode,
|
||||||
opss.second_level_node AS secondLevelNode,
|
opss.second_level_node AS secondLevelNode,
|
||||||
opss.start_time AS startTime,
|
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
|
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_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}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user