From 68aa2b43c50869bb4de6bc8022c2f4bf2d827c78 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 30 Jul 2025 16:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=A9=E6=B5=81=E8=BF=99?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OaExpressQuestionServiceImpl.java    | 27 +++++++++++--
 .../oa/service/impl/OaExpressServiceImpl.java | 38 +++++++++++++++++--
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressQuestionServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressQuestionServiceImpl.java
index 53f23af..982fd2d 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressQuestionServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressQuestionServiceImpl.java
@@ -46,7 +46,7 @@ public class OaExpressQuestionServiceImpl implements IOaExpressQuestionService {
      */
     @Override
     public TableDataInfo<OaExpressQuestionVo> queryPageList(OaExpressQuestionBo bo, PageQuery pageQuery) {
-        QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
+        QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapperPlus(bo);
         Page<OaExpressQuestionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -56,11 +56,32 @@ public class OaExpressQuestionServiceImpl implements IOaExpressQuestionService {
      */
     @Override
     public List<OaExpressQuestionVo> queryList(OaExpressQuestionBo bo) {
-        QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
+        LambdaQueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
+    private LambdaQueryWrapper<OaExpressQuestion> buildQueryWrapper(OaExpressQuestionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OaExpressQuestion> lqw = new LambdaQueryWrapper<>();
 
-    private QueryWrapper<OaExpressQuestion> buildQueryWrapper(OaExpressQuestionBo bo) {
+        if (bo.getExpressId() != null) {
+            lqw.eq(OaExpressQuestion::getExpressId, bo.getExpressId());
+        }
+        if (StringUtils.isNotBlank(bo.getDescription())) {
+            lqw.eq(OaExpressQuestion::getDescription, bo.getDescription());
+        }
+        if (bo.getReportTime() != null) {
+            lqw.eq(OaExpressQuestion::getReportTime, bo.getReportTime());
+        }
+        if (StringUtils.isNotBlank(bo.getReportBy())) {
+            lqw.eq(OaExpressQuestion::getReportBy, bo.getReportBy());
+        }
+        if (bo.getStatus() != null) {
+            lqw.eq(OaExpressQuestion::getStatus, bo.getStatus());
+        }
+        return lqw;
+    }
+
+    private QueryWrapper<OaExpressQuestion> buildQueryWrapperPlus(OaExpressQuestionBo bo) {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<OaExpressQuestion> qw = new QueryWrapper<>();
         // 设置表别名
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java
index 2a388fd..61b2615 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java
@@ -49,7 +49,7 @@ public class OaExpressServiceImpl implements IOaExpressService {
      */
     @Override
     public TableDataInfo<OaExpressVo> queryPageList(OaExpressBo bo, PageQuery pageQuery) {
-        QueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
+        QueryWrapper<OaExpress> lqw = buildQueryWrapperPlus(bo);
         Page<OaExpressVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -59,11 +59,43 @@ public class OaExpressServiceImpl implements IOaExpressService {
      */
     @Override
     public List<OaExpressVo> queryList(OaExpressBo bo) {
-        QueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
+        LambdaQueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
+    private LambdaQueryWrapper<OaExpress> buildQueryWrapper(OaExpressBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OaExpress> lqw = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(bo.getExpressCode())) {
+            lqw.like(OaExpress::getExpressCode, bo.getExpressCode());
+        }
+        if (bo.getStatus() != null) {
+            lqw.eq(OaExpress::getStatus, bo.getStatus());
+        }
+        if (StringUtils.isNotBlank(bo.getSupplyName())) {
+            lqw.like(OaExpress::getSupplyName, bo.getSupplyName());
+        }
+        if (StringUtils.isNotBlank(bo.getSupplyPhone())) {
+            lqw.eq(OaExpress::getSupplyPhone, bo.getSupplyPhone());
+        }
+        if (bo.getOwnerId() != null) {
+            lqw.eq(OaExpress::getOwnerId, bo.getOwnerId());
+        }
+        if (StringUtils.isNotBlank(bo.getOwnerPhone())) {
+            lqw.eq(OaExpress::getOwnerPhone, bo.getOwnerPhone());
+        }
+        if (bo.getPlanDate() != null) {
+            lqw.eq(OaExpress::getPlanDate, bo.getPlanDate());
+        }
+        if (bo.getProjectId() != null) {
+            lqw.eq(OaExpress::getProjectId, bo.getProjectId());
+        }
+        if (StringUtils.isNotBlank(bo.getExpressType())) {
+            lqw.eq(OaExpress::getExpressType, bo.getExpressType());
+        }
+        return lqw;
+    }
 
-    private QueryWrapper<OaExpress> buildQueryWrapper(OaExpressBo bo) {
+    private QueryWrapper<OaExpress> buildQueryWrapperPlus(OaExpressBo bo) {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<OaExpress> qw = new QueryWrapper<>();
         // 设置表别名