From ccf9064c67b7b3627a2298fbd45c2ad2ff6fc2b2 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 6 Dec 2025 15:40:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BB=93=E9=A1=B9=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SysOaProject 实体类中新增 productStatus 字段 - 在 SysOaProjectBo 业务对象中新增 productStatus 字段 - 在 SysOaProjectVo 视图对象中新增 productStatus 字段 - 更新 SysOaProjectMapper.xml 映射文件，包含 product_status 字段 - 在 SysOaProjectServiceImpl 中增加按 productStatus 筛选逻辑 --- ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java | 4 ++++ .../src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java | 3 +++ .../src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java | 4 ++++ .../com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java | 3 ++- ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java index f9ff66f..360ce53 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java @@ -167,4 +167,8 @@ public class SysOaProject extends BaseEntity { //是否置顶 private Integer isTop; + + + //生产结项状态 + private Integer productStatus; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java index 1640110..8fd4588 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java @@ -203,5 +203,8 @@ public class SysOaProjectBo extends BaseEntity { private String customerName; //是否置顶 private Integer isTop; + + //生产结项状态 + private Integer productStatus; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java index 66cc179..30b55f4 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java @@ -276,4 +276,8 @@ public class SysOaProjectVo { //是否置顶 private Integer isTop; + + + //生产结项状态 + private Integer productStatus; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java index 558080d..fe99ecb 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java @@ -200,7 +200,8 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { lqw.like(StringUtils.isNotBlank(bo.getProjectName()), SysOaProject::getProjectName, bo.getProjectName()); lqw.like(StringUtils.isNotBlank(bo.getProjectNum()), SysOaProject::getProjectNum, bo.getProjectNum()); lqw.like(StringUtils.isNotBlank(bo.getProjectCode()), SysOaProject::getProjectCode, bo.getProjectCode()); - + //新增生产结项状态筛选 + lqw.eq(bo.getProductStatus() != null, SysOaProject::getProductStatus, bo.getProductStatus()); lqw.eq(bo.getTradeType() != null, SysOaProject::getTradeType, bo.getTradeType()); lqw.gt(bo.getPrePay() != null && bo.getPrePay() > 0, SysOaProject::getPrePay, 0); lqw.eq(StringUtils.isNotBlank(bo.getProjectType()), SysOaProject::getProjectType, bo.getProjectType()); diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml index 76c3477..17a1595 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml @@ -286,6 +286,7 @@ p.introduction, p.project_grade, p.project_status, + p.product_status, p.contract_id, p.invoice_name, p.invoice_number,