From 0f857a7c123934fbd87d6e2615cab2989cba6161 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 12 Dec 2025 10:14:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E8=A1=A8=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在OaProjectScheduleDelayBo中新增scheduleId和projectId字段
- 在查询构建器中增加对scheduleId和projectId的关联查询条件
- 为复杂查询场景预留扩展注释说明
---
 .../ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java   | 10 ++++++++++
 .../impl/OaProjectScheduleDelayServiceImpl.java        |  5 +++++
 2 files changed, 15 insertions(+)

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;
     }