From 53f58dc9e1a03537339de045a8b66539432da6d4 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 11 Nov 2025 14:01:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=96=B0=E5=A2=9E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=BA=A6=E6=AD=A5=E9=AA=A4=E5=88=86=E9=A1=B5?=
 =?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

- 在OaProjectScheduleStepMapper中添加selectVoPageNew方法
- 在OaProjectScheduleStepMapper.xml中实现对应的SQL查询逻辑
- 修改OaProjectScheduleStepServiceImpl中的queryPageListPage方法，使用新的查询方法
- 删除旧的buildQueryWrapperLambda方法，改用QueryWrapper构建查询条件
- 在buildQueryWrapper方法中增加nodeHeader、startTime和endTime的查询条件- 在OaProjectScheduleStepVo中添加projectId和projectName字段
---
 .../oa/domain/vo/OaProjectScheduleStepVo.java |  4 ++
 .../mapper/OaProjectScheduleStepMapper.java   |  2 +
 .../OaProjectScheduleStepServiceImpl.java     | 22 +++------
 .../mapper/oa/OaProjectScheduleStepMapper.xml | 48 +++++++++++++++++++
 4 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java
index 838fe97..f27af17 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java
@@ -187,6 +187,10 @@ public class OaProjectScheduleStepVo extends BaseEntity {
     //其他
     private String other;
 
+    private Long projectId;
+
+    private String projectName;
+
     /** 进度统计内部类（封装total、completed等字段） */
     @Data
     public static class ProgressStats {
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleStepMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleStepMapper.java
index dfce779..976f64f 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleStepMapper.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleStepMapper.java
@@ -37,4 +37,6 @@ public interface OaProjectScheduleStepMapper extends BaseMapperPlus<OaProjectSch
      * @return 删除的记录数
      */
     int deleteByScheduleIds(@Param("scheduleIds") Collection<Long> scheduleIds);
+
+    Page<OaProjectScheduleStepVo> selectVoPageNew(Page<Object> build,@Param(Constants.WRAPPER) QueryWrapper<OaProjectScheduleStep> lqw);
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java
index 403a851..7f4885a 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java
@@ -100,25 +100,11 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS
     }
     @Override
     public TableDataInfo<OaProjectScheduleStepVo> queryPageListPage(OaProjectScheduleStepBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<OaProjectScheduleStep> lqw = buildQueryWrapperLambda(bo);
-        Page<OaProjectScheduleStepVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<OaProjectScheduleStep> lqw = buildQueryWrapper(bo);
+        Page<OaProjectScheduleStepVo> result = baseMapper.selectVoPageNew(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
-    private LambdaQueryWrapper<OaProjectScheduleStep> buildQueryWrapperLambda(OaProjectScheduleStepBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<OaProjectScheduleStep> lqw = Wrappers.lambdaQuery();
-
-        lqw.eq(bo.getScheduleId() != null, OaProjectScheduleStep::getScheduleId, bo.getScheduleId())
-                .eq(OaProjectScheduleStep::getDelFlag, 0)
-                .eq(bo.getStepOrder() != null, OaProjectScheduleStep::getStepOrder, bo.getStepOrder())
-                .like(StringUtils.isNotBlank(bo.getStepName()), OaProjectScheduleStep::getStepName, bo.getStepName())
-                .eq(bo.getStatus() != null, OaProjectScheduleStep::getStatus, bo.getStatus());
-
-        return lqw;
-    }
-
-
     /**
      * 查询项目进度步骤跟踪列表
      */
@@ -137,6 +123,10 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS
         lqw.eq(bo.getStepOrder() != null, "opss.step_order", bo.getStepOrder());
         lqw.like(StringUtils.isNotBlank(bo.getStepName()), "opss.step_name", bo.getStepName());
         lqw.eq(bo.getStatus() != null, "opss.status", bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getNodeHeader()), "opss.node_header", bo.getNodeHeader());
+        //根据开始时间和结束时间作为范围判断planEnd
+        lqw.ge(bo.getStartTime() != null, "opss.plan_end", bo.getStartTime());
+        lqw.le(bo.getEndTime() != null, "opss.plan_end", bo.getEndTime());
         return lqw;
     }
 
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleStepMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleStepMapper.xml
index a8afd90..c6c482b 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleStepMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleStepMapper.xml
@@ -209,6 +209,54 @@
           and use_flag = '1'
           AND del_flag = '0'
     </select>
+    <select id="selectVoPageNew" resultType="com.ruoyi.oa.domain.vo.OaProjectScheduleStepVo">
+        SELECT
+            opss.track_id,
+            opss.accessory,
+            opss.schedule_id,
+            opss.step_order,
+            opss.step_name,
+            opss.plan_start,
+            opss.plan_end,
+            opss.actual_start,
+            opss.actual_end,
+            opss.status,
+            opss.create_by,
+            opss.create_time,
+            opss.update_by,
+            opss.update_time,
+            opss.del_flag,
+            opss.header,
+            opss.use_flag,
+            opss.batch_id,
+            opss.tab_node,
+            opss.first_level_node,
+            opss.second_level_node,
+            opss.start_time,
+            opss.original_end_time,
+            opss.end_time,
+            opss.node_header,
+            opss.related_docs,
+            opss.related_images,
+            opss.supplier_id,
+            opss.requirement_file,
+            opss.other,
+            opss.specification,
+            opss.sort_num,
+            schedule.project_id AS projectId,
+            project.project_name AS projectName,
+            supplier.supplier_name AS supplierName
+        FROM
+            oa_project_schedule_step opss
+                INNER JOIN oa_project_schedule schedule
+                           ON opss.schedule_id = schedule.schedule_id
+                INNER JOIN sys_oa_project project
+                           ON schedule.project_id = project.project_id
+--             根据供应商id拿供应商名字
+                LEFT JOIN oa_supplier supplier
+                           ON opss.supplier_id = supplier.supplier_id
+        #{ew.customSqlSegment}
+    </select>
 
 
 </mapper>