diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java index 7e03a14..eb732b4 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java @@ -88,5 +88,15 @@ public class OaProjectScheduleDelayBo extends BaseEntity { */ private String remark; + /** + * 进度表ID(通过trackId关联查询) + */ + private Long scheduleId; + + /** + * 项目ID(通过scheduleId关联查询) + */ + private Long projectId; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java index d5a636c..9ea904a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java @@ -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; }