From 120ae4f38a833ed5277c175b526ed6c1aafb8e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Wed, 3 Dec 2025 15:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8=E9=A1=B9=E7=9B=AE=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java | 2 ++ .../main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java | 2 ++ .../ruoyi/oa/service/impl/OaProjectScheduleServiceImpl.java | 2 ++ .../src/main/resources/mapper/oa/OaProjectScheduleMapper.xml | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java index eb3701a..59819bf 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java @@ -71,4 +71,6 @@ public class OaProjectSchedule extends BaseEntity { //进度负责人 private String steward; + private String projectNum; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java index b1bbb4b..8653bbf 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java @@ -86,4 +86,6 @@ public class OaProjectScheduleBo extends BaseEntity { private Integer tradeType; //项目代号 private String projectCode; + + private String projectNum; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleServiceImpl.java index a41b7f8..ab0f981 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleServiceImpl.java @@ -87,6 +87,7 @@ public class OaProjectScheduleServiceImpl implements IOaProjectScheduleService { QueryWrapper lqw = Wrappers.query(); lqw.eq("ops.del_flag", 0); lqw.eq(bo.getProjectId() != null,"ops.project_id", bo.getProjectId()); + lqw.eq(bo.getTemplateId() != null, "ops.template_id", bo.getTemplateId()); lqw.eq(bo.getCurrentStep() != null, "ops.current_step", bo.getCurrentStep()); lqw.eq(bo.getStatus() != null, "ops.status", bo.getStatus()); @@ -94,6 +95,7 @@ public class OaProjectScheduleServiceImpl implements IOaProjectScheduleService { lqw.eq(bo.getTradeType() !=null, "op.trade_type",bo.getTradeType()); //根据代号 lqw.like(bo.getProjectCode() != null, "op.project_code", bo.getProjectCode()); + lqw.like(bo.getProjectNum() != null, "op.project_num", bo.getProjectNum()); lqw.gt(bo.getPrePay()!=null&&bo.getPrePay()>0, "op.pre_pay", 0); // lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, // "op.begin_time", params.get("beginCreateTime"), params.get("endCreateTime")); diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleMapper.xml index df2fa14..c829933 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleMapper.xml @@ -63,7 +63,8 @@ ) AS schedulePercentage FROM oa_project_schedule AS ops - LEFT JOIN sys_oa_project AS op ON ops.project_id = op.project_id + LEFT JOIN sys_oa_project AS op + ON ops.project_id = op.project_id LEFT JOIN oa_project_schedule_step AS opss ON ops.schedule_id = opss.schedule_id AND opss.step_order = ops.current_step