feat(oa): 添加进度表和项目关联查询功能

- 在OaProjectScheduleDelayBo中新增scheduleId和projectId字段
- 在查询构建器中增加对scheduleId和projectId的关联查询条件
- 为复杂查询场景预留扩展注释说明
This commit is contained in:
2025-12-12 10:14:00 +08:00
parent 70d380ac65
commit 0f857a7c12
2 changed files with 15 additions and 0 deletions

View File

@@ -88,5 +88,15 @@ public class OaProjectScheduleDelayBo extends BaseEntity {
*/
private String remark;
/**
* 进度表ID通过trackId关联查询
*/
private Long scheduleId;
/**
* 项目ID通过scheduleId关联查询
*/
private Long projectId;
}

View File

@@ -72,6 +72,9 @@ public class OaProjectScheduleDelayServiceImpl implements IOaProjectScheduleDela
lqw.eq(bo.getApproveResult() != null, "opsd.approve_result", bo.getApproveResult());
lqw.like(StringUtils.isNotBlank(bo.getApproveRemark()), "opsd.approve_remark", bo.getApproveRemark());
lqw.eq(bo.getDelayStatus() != null, "opsd.delay_status", bo.getDelayStatus());
// 添加进度表ID和项目ID查询条件
lqw.eq(bo.getScheduleId() != null, "opss.schedule_id", bo.getScheduleId());
lqw.eq(bo.getProjectId() != null, "ops.project_id", bo.getProjectId());
lqw.orderByDesc("opsd.create_time");
return lqw;
}
@@ -99,6 +102,8 @@ public class OaProjectScheduleDelayServiceImpl implements IOaProjectScheduleDela
lqw.eq(bo.getApproveResult() != null, OaProjectScheduleDelay::getApproveResult, bo.getApproveResult());
lqw.eq(StringUtils.isNotBlank(bo.getApproveRemark()), OaProjectScheduleDelay::getApproveRemark, bo.getApproveRemark());
lqw.eq(bo.getDelayStatus() != null, OaProjectScheduleDelay::getDelayStatus, bo.getDelayStatus());
// 对于简单查询需要自定义SQL来支持scheduleId和projectId的关联查询
// 这里暂时不修改因为复杂查询通常使用buildQueryWrapperPlus方法
lqw.orderByDesc(OaProjectScheduleDelay::getCreateTime);
return lqw;
}